commit | 9b9c708de1465b15d4fcebb7c6250e23be151995 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Thu Dec 29 12:04:28 2011 -0600 |
committer | Benjamin Peterson <benjamin@python.org> | Thu Dec 29 12:04:28 2011 -0600 |
tree | 50ce65eeb78cab4e1e409a0e60e4cf2f22b436c8 | |
parent | 3ab85886d6ba0e9cae548b07429ff783a4f633bc [diff] | |
parent | 78091e63d650edd9df09e3fd90d4cceed27b9a74 [diff] |
merge heads