]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 28 Sep 2011 14:48:40 +0000 (10:48 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 28 Sep 2011 14:48:40 +0000 (10:48 -0400)
commite56717c3d201db2dadacd20f654d6be7f9ed18ed
treee0df9e7bf6ab16052edaa32311ab66278bc73404
parent19f6260710b3d086abcbe400194b203be11b60ab
parentd8b509b192a67f0f217ae52ed81fc91bc27a1818
merge heads