]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 31 Oct 2012 17:36:21 +0000 (13:36 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 31 Oct 2012 17:36:21 +0000 (13:36 -0400)
commita28cf6fef927dce1d7ab21c322a959b835674e78
tree8f1c5274907eac249d685a49e4c856411669fc46
parent742b2f8d7a6b728e925ad83f704af0ff5fb06848
parent0a4dfc3db93120581d15d70885ad76789963082b
merge heads