commit | 3760d97f9b62be6d25a5530e35899d3612d7fb7b | [log] [tgz] |
---|---|---|
author | Barry Warsaw <barry@python.org> | Tue Oct 01 11:39:08 2013 -0400 |
committer | Barry Warsaw <barry@python.org> | Tue Oct 01 11:39:08 2013 -0400 |
tree | 0d5a3a0437c233a9171e8ac9895f8716dbd6bea0 | |
parent | 34f7c4ee806bfbbe4a6fe8bced6b46608cd706b2 [diff] | |
parent | aa914509d36a6def58db03ddc738d62f7c527d96 [diff] |
2.6 merge