]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge with 3.4
authorGeorg Brandl <georg@python.org>
Thu, 6 Nov 2014 14:33:35 +0000 (15:33 +0100)
committerGeorg Brandl <georg@python.org>
Thu, 6 Nov 2014 14:33:35 +0000 (15:33 +0100)

Trivial merge