]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGeorg Brandl <georg@python.org>
Sat, 16 Mar 2013 07:03:13 +0000 (08:03 +0100)
committerGeorg Brandl <georg@python.org>
Sat, 16 Mar 2013 07:03:13 +0000 (08:03 +0100)

Trivial merge