commit | daf28293e1a422efa222a493b378b4614e7c5512 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Thu Nov 29 10:57:11 2012 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Thu Nov 29 10:57:11 2012 -0500 |
tree | ec7cb546f33e3ea920ec3a2d8ee94d6a5447e66f | |
parent | 139891ba82b37631d01c33397f0bbde7d0adcc1b [diff] | |
parent | 343d530d67542d2272f2f72afff8a476bb7f9e8b [diff] |
merge 3.2