tree 45592ac05926c87b262c7d947f2d49958a68dbfa
parent 34d8e41a474f43dabca4096e5f945ca67e69a5b8
parent 197e22c1d700c9ae71f80b59544fbe423d19017e
author Brett Cannon <brett@python.org> 1330010276 -0500
committer Brett Cannon <brett@python.org> 1330010276 -0500
HG:rename-source hg

Merge