]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorGeorg Brandl <georg@python.org>
Sun, 12 May 2013 09:24:58 +0000 (11:24 +0200)
committerGeorg Brandl <georg@python.org>
Sun, 12 May 2013 09:24:58 +0000 (11:24 +0200)

Trivial merge