]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Fri, 12 Oct 2012 16:02:06 +0000 (12:02 -0400)
committerBenjamin Peterson <benjamin@python.org>
Fri, 12 Oct 2012 16:02:06 +0000 (12:02 -0400)

Trivial merge