commit | bada35bdf5207fd11065858989e29b8a1591e965 | [log] [tgz] |
---|---|---|
author | Georg Brandl <georg@python.org> | Thu Feb 23 21:16:49 2012 +0100 |
committer | Georg Brandl <georg@python.org> | Thu Feb 23 21:16:49 2012 +0100 |
tree | 01c4a3645e3a6751a1bcc3c4fcaa0cc5338d9959 | |
parent | 0abf61db4dd0d008ad06c84cd882fb84e5c11181 [diff] | |
parent | 29ca21c7026a3c216a46024b67572e7723a56ab4 [diff] |
merge heads