]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge 3.4.
authorMartin v. Löwis <martin@v.loewis.de>
Sun, 30 Mar 2014 19:33:18 +0000 (21:33 +0200)
committerMartin v. Löwis <martin@v.loewis.de>
Sun, 30 Mar 2014 19:33:18 +0000 (21:33 +0200)

Trivial merge