tree 1a4501e649edfdbd13656e8ee21240eddf333861
parent 7bdf786e747e59ab47a3c45c0fd42c12cd7cb221
parent a48d9eaa5ccb3d8d0e224e78471bd660605116ec
author Benjamin Peterson <benjamin@python.org> 1395003384 -0500
committer Benjamin Peterson <benjamin@python.org> 1395003384 -0500
HG:rename-source hg

merge 3.3 (#11448)