tree c3badac5a2b4840ea8ed62d12dbb01740c273336
parent 832bfe2ebd5ecfa92031cd40c8b41835ba90487f
parent 77c4fd01dd3fa9b7830ca3dcd1506565352d32f3
author Benjamin Peterson <benjamin@python.org> 1312924529 -0500
committer Benjamin Peterson <benjamin@python.org> 1312924529 -0500
HG:rename-source hg

merge 3.2 (#12719)