tree 9352ccd0a0602c38f74c67425a0e1896da766d75
parent 49f373bf664518bb67c11ea600306a820fd5a6e8
parent a915723dc780f2c6753487795988fe3b75e140a9
author Benjamin Peterson <benjamin@python.org> 1425650986 -0500
committer Benjamin Peterson <benjamin@python.org> 1425650986 -0500
HG:rename-source hg

merge 3.4 (#23590)