tree a2ff577859f84b27a2ed16f8f39c6fed49180960
parent 9d2801095f6186a0993259fe558a22c27abeb8be
parent 6215444a0a35cca9c3893e319d309de102d47f28
author Benjamin Peterson <benjamin@python.org> 1333391155 -0400
committer Benjamin Peterson <benjamin@python.org> 1333391155 -0400
HG:rename-source hg

merge 3.2