tree c881c86ac8de87b97257d5afaa80ed0a4123fe80
parent 4b4f9ebfea4148b9d483aefb24f88c18e1f505b4
parent f0b463ad845c7433a0c561ef2c71d350f4b508c5
author Benjamin Peterson <benjamin@python.org> 1390581880 -0500
committer Benjamin Peterson <benjamin@python.org> 1390581880 -0500
HG:rename-source hg

merge 3.3 (#20374)