]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Mon, 2 Apr 2012 18:25:55 +0000 (14:25 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 2 Apr 2012 18:25:55 +0000 (14:25 -0400)

Trivial merge