]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 24 Dec 2012 17:54:13 +0000 (11:54 -0600)
committerBenjamin Peterson <benjamin@python.org>
Mon, 24 Dec 2012 17:54:13 +0000 (11:54 -0600)
commit7321e97c20fbe16d4aa7b293998d5dd6562cb776
tree0adb88aa87e8c3710c8cee40f9581f2471945c61
parent6f0c94df50f30aac8d9a1a9f85adcda1e63d0ab7
parentabb4f4814e48a5293baec3d303d40a419b969866
merge heads