]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
null-merge with 3.3
authorGeorg Brandl <georg@python.org>
Mon, 1 Oct 2012 16:57:34 +0000 (18:57 +0200)
committerGeorg Brandl <georg@python.org>
Mon, 1 Oct 2012 16:57:34 +0000 (18:57 +0200)

Trivial merge