]> granicus.if.org Git - python/commitdiff
merge 3.2
authorGeorg Brandl <georg@python.org>
Wed, 10 Oct 2012 14:49:11 +0000 (16:49 +0200)
committerGeorg Brandl <georg@python.org>
Wed, 10 Oct 2012 14:49:11 +0000 (16:49 +0200)

Trivial merge