]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 11 Apr 2012 20:10:07 +0000 (16:10 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 11 Apr 2012 20:10:07 +0000 (16:10 -0400)
commita82f3edc1358796b4012f38532a13929917ddd5b
tree72d7899bfa4d519fe73be105e374cbab4170e49d
parentfbf764e3509e28c3aea73254e5172c71a98ad300
parent3661473ae00fd8a82dd693de8b7ca2c1c907978a
merge heads