tree 59b24b2939f48e21dbff1dd44f488a00c4803645
parent e380e0986bcec1eff78655d559774d71417b799d
parent 2a6053468ea318acc2b382808f858d853cf3a89a
author Benjamin Peterson <benjamin@python.org> 1395091250 -0500
committer Benjamin Peterson <benjamin@python.org> 1395091250 -0500
HG:rename-source hg

merge 3.4