]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
null-merge from 3.3
authorGeorg Brandl <georg@python.org>
Wed, 15 May 2013 17:43:15 +0000 (19:43 +0200)
committerGeorg Brandl <georg@python.org>
Wed, 15 May 2013 17:43:15 +0000 (19:43 +0200)

Trivial merge