]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGeorg Brandl <georg@python.org>
Sun, 28 Oct 2012 12:37:05 +0000 (13:37 +0100)
committerGeorg Brandl <georg@python.org>
Sun, 28 Oct 2012 12:37:05 +0000 (13:37 +0100)

Trivial merge