tree 83ab157488dd364de2a26b453c34e6ce7cc29537
parent 6d8f744730c0689d822db1a2425170d7d5d44aca
parent 900c292c6b886ad9c693d7e0481dc16398d5071d
author Benjamin Peterson <benjamin@python.org> 1315310258 -0400
committer Benjamin Peterson <benjamin@python.org> 1315310258 -0400
HG:rename-source hg

merge heads