]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.2 heads
authorGeorg Brandl <georg@python.org>
Wed, 10 Oct 2012 14:49:02 +0000 (16:49 +0200)
committerGeorg Brandl <georg@python.org>
Wed, 10 Oct 2012 14:49:02 +0000 (16:49 +0200)

Trivial merge