]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Sun, 7 Jun 2015 04:20:40 +0000 (23:20 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 7 Jun 2015 04:20:40 +0000 (23:20 -0500)

Trivial merge