tree 575662a8fcdc42bea34630f850c2170b968a9b6d
parent 6b9b7276955180b3dde07d53ec3d67e76c39d3ff
parent 5182c18b1a4ac11c9825117ecdc51c1ef013c66b
author Brett Cannon <brett@python.org> 1336161899 -0400
committer Brett Cannon <brett@python.org> 1336161899 -0400
HG:rename-source hg

merge