tree ce609334f1f63e25a45d35afe34783755894f3f0
parent cfb5b87860a6c605c89ec9d409852641ae47f654
parent c8358273aec3915c13597c0c5cb5d633589c9da0
author Benjamin Peterson <benjamin@python.org> 1425822160 -0400
committer Benjamin Peterson <benjamin@python.org> 1425822160 -0400
HG:rename-source hg

merge 3.4 (#23608)