tree c38b1d6ede22de9570abb92ce404bf209f9ebb97
parent 49776ef9e75065daf21c194c212cde73b378ff30
parent 3836593a2d9d8958325f3c312abb9207d47f87e6
author Benjamin Peterson <benjamin@python.org> 1390099871 -0500
committer Benjamin Peterson <benjamin@python.org> 1390099871 -0500
HG:rename-source hg

merge 3.3 (#18574)