commit | d021f72abfbff732fdb25da7965fe0316a86c3b3 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Tue May 17 18:32:26 2011 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Tue May 17 18:32:26 2011 -0500 |
tree | f255e7db3b357ac3301cc9440f29dc1de4bc699e | |
parent | 6116d4a1d1ecd6e9b94cfaa524b9b7cd5a6b5447 [diff] | |
parent | 2c5e28ebc21b8517cfaa3075dabb81f963be0303 [diff] |
merge heads