]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
null-merge from 3.3
authorGeorg Brandl <georg@python.org>
Sun, 30 Sep 2012 07:42:11 +0000 (09:42 +0200)
committerGeorg Brandl <georg@python.org>
Sun, 30 Sep 2012 07:42:11 +0000 (09:42 +0200)

Trivial merge