]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.4
authorMartin v. Löwis <martin@v.loewis.de>
Mon, 9 Feb 2015 07:10:32 +0000 (08:10 +0100)
committerMartin v. Löwis <martin@v.loewis.de>
Mon, 9 Feb 2015 07:10:32 +0000 (08:10 +0100)

Trivial merge