tree 163cb398c8d0c335a740f3e6f8f07db636a8bcfd
parent 2fa0cbc9ae6bb8d29b3c8c1e871192602666157a
parent 1ae230aa1a0c7b51839c6d07eaaddfeef71be63b
author Benjamin Peterson <benjamin@python.org> 1331153953 -0600
committer Benjamin Peterson <benjamin@python.org> 1331153953 -0600
HG:rename-source hg

merge 3.2 (#14212)