commit | 0bb83f812f2a253d478c1a4f33e4b10685c5c5db | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Apr 29 10:23:31 2013 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Apr 29 10:23:31 2013 -0400 |
tree | de8f22092a15df5319f9cab18fa934c2e97b1f69 | |
parent | 5c089314efb94d3ab4ddfea9c27d408e97ec3ff2 [diff] | |
parent | fe1b22af0a9d696918204adaaae125a9bf86c5cf [diff] |
merge 3.3 (#17863)