commit | 537f15645a42799594dc735545bcdad79f8ebd9c | [log] [tgz] |
---|---|---|
author | Barry Warsaw <barry@python.org> | Fri Aug 23 13:38:02 2013 -0400 |
committer | Barry Warsaw <barry@python.org> | Fri Aug 23 13:38:02 2013 -0400 |
tree | 1e4430a1f1850290a9b010cdb53aed9a0c172137 | |
parent | 78cc8daa9baa49853f914addcd26ee2807d4cef6 [diff] | |
parent | 82f88283171933127f20f866a7f98694b29cca56 [diff] |
null merge with 2.6