]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge with 2.6
authorGeorg Brandl <georg@python.org>
Sun, 28 Oct 2012 07:06:11 +0000 (08:06 +0100)
committerGeorg Brandl <georg@python.org>
Sun, 28 Oct 2012 07:06:11 +0000 (08:06 +0100)

Trivial merge