]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge with 3.4
authorGeorg Brandl <georg@python.org>
Tue, 25 Mar 2014 09:13:44 +0000 (10:13 +0100)
committerGeorg Brandl <georg@python.org>
Tue, 25 Mar 2014 09:13:44 +0000 (10:13 +0100)

Trivial merge