| commit | 2fbe7622e28ddf93e8fee261b0b46fed04bb364d | [log] [tgz] |
|---|---|---|
| author | Brian Curtin <brian@python.org> | Mon Aug 13 17:20:00 2012 -0500 |
| committer | Brian Curtin <brian@python.org> | Mon Aug 13 17:20:00 2012 -0500 |
| tree | 67ccaf8f295fdfb2855d3419dd63940bc574b2ad | |
| parent | 835df52471421bfc360653422fb24eb6da2a00cf [diff] |
errant merge problem committed