tree b22236bed104ef1b6c4d4e4604d533fb3bb64bb6
parent b64ae7bf2dcc010e6f0414d365e1ee4caba58ef0
parent 990fcaac3c428569697f62a80fd95ab4d4b93151
author Benjamin Peterson <benjamin@python.org> 1425527425 -0500
committer Benjamin Peterson <benjamin@python.org> 1425527425 -0500
HG:rename-source hg

merge 3.4