]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.5 (#25504)
authorBenjamin Peterson <benjamin@python.org>
Fri, 30 Oct 2015 04:11:29 +0000 (21:11 -0700)
committerBenjamin Peterson <benjamin@python.org>
Fri, 30 Oct 2015 04:11:29 +0000 (21:11 -0700)

Trivial merge