tree c082e8a01eed934b73eb83b18bffff047b9c4a99
parent 864a78ed72525041ca52fc99ead8af48c02f6cd5
parent 0d5742dec0a44c6fdbb544bc683855ff78554e72
author Benjamin Peterson <benjamin@python.org> 1481183703 -0800
committer Benjamin Peterson <benjamin@python.org> 1481183703 -0800
HG:rename-source hg

merge 3.6 (#28898)