commit | 22dabb6ffa5860ee08138c2f67b0406d566df5f4 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Oct 24 08:51:46 2011 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Oct 24 08:51:46 2011 -0400 |
tree | 554c26e10f49f9944406db93276eec579bbe417e | |
parent | 414ffa86b5d8286b7d24ac35677bd90b98fe21b4 [diff] | |
parent | 8671157863060f259394d76e35ca6bfd594024be [diff] |
merge heads