]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.5 (#26827)
authorBenjamin Peterson <benjamin@python.org>
Sat, 23 Apr 2016 06:43:24 +0000 (23:43 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sat, 23 Apr 2016 06:43:24 +0000 (23:43 -0700)

Trivial merge