]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 11 Apr 2012 20:12:21 +0000 (16:12 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 11 Apr 2012 20:12:21 +0000 (16:12 -0400)
commitff670467915a4daf83faac0bf6e633fc1ba81497
tree66ff41800070542385e7cc27f2b8f09adb2cfc8c
parenta82f3edc1358796b4012f38532a13929917ddd5b
parent5f7e7345cf4f583c127160aa43ee5c3fea7ba06f
merge heads