]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.5 (#26986)
authorBenjamin Peterson <benjamin@python.org>
Tue, 10 May 2016 06:44:30 +0000 (23:44 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 10 May 2016 06:44:30 +0000 (23:44 -0700)

Trivial merge