]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge with 3.4
authorGeorg Brandl <georg@python.org>
Tue, 30 Sep 2014 20:56:47 +0000 (22:56 +0200)
committerGeorg Brandl <georg@python.org>
Tue, 30 Sep 2014 20:56:47 +0000 (22:56 +0200)

Trivial merge