tree b0e84be60ce2e66291392e7e220d1b16572e434c
parent 17061a99b03dc101e7ab7a20ab23411f077b3efe
parent 6423429325f4f2309892f530417bc9737268be38
author Benjamin Peterson <benjamin@python.org> 1471415862 -0700
committer Benjamin Peterson <benjamin@python.org> 1471415862 -0700
HG:rename-source hg

merge 3.5 (#27783)