tree 992ea285a183b368235c44b5acedadc0306237e5
parent 8bf66ca59803580e8b1d51f08e222b0d16359535
parent e2e792d98feef833eaff28d8fe1249953c9da6ca
author Benjamin Peterson <benjamin@python.org> 1474348664 -0700
committer Benjamin Peterson <benjamin@python.org> 1474348664 -0700
HG:rename-source hg

merge 3.6 (closes #28184)