commit | 66471134190c4f33fbaa97b736078fe761be5635 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Tue Feb 21 15:09:08 2012 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Tue Feb 21 15:09:08 2012 -0500 |
tree | 6fe266a58d4de1a1a7a69a17f1068eb83218348b | |
parent | 5d6eab9088a88e37f4a612e563cdab103b9676cb [diff] | |
parent | 4e171d12da0e75ddcf5e019d5ca4553ca86265cd [diff] |
merge 2.6