tree 23c45b7a11cc0ffed5e4a8e9f7bc0951d2a1edfc
parent e87b7eafe4f7535938584298c7db2cefe864846f
parent c44eb73473f31dfde1e8cb6ba485a309e3b0757e
author Benjamin Peterson <benjamin@python.org> 1412045345 -0400
committer Benjamin Peterson <benjamin@python.org> 1412045345 -0400
HG:rename-source hg

merge 3.4 (#22517)