tree 5aae5f51aa0a8ee808841152409b48e51d3cf870
parent 504f6e8653f7d8ccd81ee8376149a54e2a3f839d
parent 9743b2c2b584b0f0e56e33705e81b8b663dc03c3
author Benjamin Peterson <benjamin@python.org> 1392487400 -0500
committer Benjamin Peterson <benjamin@python.org> 1392487400 -0500
HG:rename-source hg

merge 3.3 (#20507)