]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge with 3.4
authorGeorg Brandl <georg@python.org>
Thu, 30 Oct 2014 21:45:30 +0000 (22:45 +0100)
committerGeorg Brandl <georg@python.org>
Thu, 30 Oct 2014 21:45:30 +0000 (22:45 +0100)

Trivial merge