commit | 200fe3d747fe8da9a5043632dad435b33c492439 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon May 23 16:29:50 2011 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Mon May 23 16:29:50 2011 -0500 |
tree | 484d738b47a7cb9e7dafcf065668357ef5558c7a | |
parent | f5fcd33be9b21b148774d3fa2832bb0627e94809 [diff] | |
parent | a2a895c46c8e838a29308dd0da7ab1d364ff4495 [diff] |
merge heads