commit | f7254bd2aa78622c85be3945b59490773cbb1b3e | [log] [tgz] |
---|---|---|
author | Barry Warsaw <barry@python.org> | Tue Feb 21 11:16:52 2012 -0500 |
committer | Barry Warsaw <barry@python.org> | Tue Feb 21 11:16:52 2012 -0500 |
tree | 1bb8763137b006a1ab328847821c4d8e9a4b42a2 | |
parent | f364b15985a668716b76670e8f3cb5c3680fd3b0 [diff] | |
parent | 8757cad394ff09bfd600e38390cacc7ce48a8773 [diff] |
merge 2.6