commit | b0fc9c4d0af00e002a6a9b43563c447281313950 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Tue Aug 02 22:09:56 2011 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Tue Aug 02 22:09:56 2011 -0500 |
tree | 91523356c4261e4174a6f1db28edc1d7397e98f3 | |
parent | 539b6c41ffe5962af72ab394d87ded296ce0d19a [diff] | |
parent | 2b6ee286309bde403c9493e2c75d35c4f5b5abcb [diff] |
merge heads