tree 7f8d108bc7f3c69fbc2037354a6d6a253ec2ff49
parent 190a32f3ed9dceee2db51da5c5cbed41e90895c7
parent 41e35f37edf760898f9c440ac17a4c542c9d88a1
author Benjamin Peterson <benjamin@python.org> 1474246984 -0700
committer Benjamin Peterson <benjamin@python.org> 1474246984 -0700
HG:rename-source hg

merge 3.6