]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4 (#25145)
authorBenjamin Peterson <benjamin@python.org>
Sun, 20 Sep 2015 18:18:51 +0000 (23:18 +0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 20 Sep 2015 18:18:51 +0000 (23:18 +0500)

Trivial merge