]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGeorg Brandl <georg@python.org>
Tue, 8 Oct 2013 18:29:47 +0000 (20:29 +0200)
committerGeorg Brandl <georg@python.org>
Tue, 8 Oct 2013 18:29:47 +0000 (20:29 +0200)

Trivial merge