tree 05581ecb35f250b8d262f7fb01c97f3ffbbd0b68
parent 9aae3a8cf557256e1f7a46f0ba19581949b5a805
parent fcb393c0183c6a8cf47eb9575a1bbe6bc5d236e4
author Benjamin Peterson <benjamin@python.org> 1312924593 -0500
committer Benjamin Peterson <benjamin@python.org> 1312924593 -0500
HG:rename-source hg

merge heads