]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGeorg Brandl <georg@python.org>
Sun, 25 Mar 2012 18:38:15 +0000 (20:38 +0200)
committerGeorg Brandl <georg@python.org>
Sun, 25 Mar 2012 18:38:15 +0000 (20:38 +0200)

Trivial merge