tree b523710e0878ec4f798a055760a263f890f0893f
parent 961900ad85240f999ea7be9f03e07c52ba63c051
parent 1af8b63447033e156eaf7bf9620a242089fa9f5b
author Benjamin Peterson <benjamin@python.org> 1467839084 -0700
committer Benjamin Peterson <benjamin@python.org> 1467839084 -0700
HG:rename-source hg

merge 3.5