]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge with 3.4
authorGeorg Brandl <georg@python.org>
Mon, 6 Oct 2014 15:51:53 +0000 (17:51 +0200)
committerGeorg Brandl <georg@python.org>
Mon, 6 Oct 2014 15:51:53 +0000 (17:51 +0200)

Trivial merge