]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 1 Jun 2011 00:08:12 +0000 (19:08 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 1 Jun 2011 00:08:12 +0000 (19:08 -0500)
commitbdc21fbaf9dd32b5c140e5ee78575d5465379467
tree413d772196a33453e7484af54b1a204420d0f792
parent35a9b1ca1347400bb12e2af3d6b38f2549c5d9dc
parente9b185f26318e7ff34bd8ec36a509cd85106d696
merge heads