]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
null-merge from 3.3
authorGeorg Brandl <georg@python.org>
Sat, 29 Sep 2012 12:22:04 +0000 (14:22 +0200)
committerGeorg Brandl <georg@python.org>
Sat, 29 Sep 2012 12:22:04 +0000 (14:22 +0200)

Trivial merge