tree e8c09ed44ae656f80523549d53dfc29fe96ef707
parent cc39b1ed1de3050ace054b9ecf5cab494062a8ef
parent 0d0813a81678e4e8a416e8e964b710e51c0b5b7f
author Brett Cannon <brett@python.org> 1371317887 -0400
committer Brett Cannon <brett@python.org> 1371317887 -0400
HG:rename-source hg

merge