]> granicus.if.org Git - python/commitdiff
merge 3.2 (#16573)
authorBenjamin Peterson <benjamin@python.org>
Thu, 29 Nov 2012 15:56:11 +0000 (10:56 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 29 Nov 2012 15:56:11 +0000 (10:56 -0500)

Trivial merge