]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Thu, 22 Mar 2012 12:56:27 +0000 (08:56 -0400)
committerBenjamin Peterson <benjamin@python.org>
Thu, 22 Mar 2012 12:56:27 +0000 (08:56 -0400)

Trivial merge