tree 5f27b7811d1335961361f85103b57f8ebf0e72ea
parent 5ab2699c282a83523d753c8bd7278c8f2aa93608
parent 1378f7ca68329e6eebdd1b47bcb7b86fca2aff24
author Benjamin Peterson <benjamin@python.org> 1455776315 -0800
committer Benjamin Peterson <benjamin@python.org> 1455776315 -0800
HG:rename-source hg

merge 3.5 (closes #25939)