tree 8d918b46a10db64dd071e7d9f8c3b0c32dcff32d
parent c28ab08887ae1de3a759d77a227f4a2c8d9c918f
parent a96860c91cabb94675c25435e8d11443abb70db7
author Benjamin Peterson <benjamin@python.org> 1390102325 -0500
committer Benjamin Peterson <benjamin@python.org> 1390102325 -0500
HG:rename-source hg

merge 3.3 (#18574)