]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Fri, 27 May 2016 06:19:02 +0000 (23:19 -0700)
committerBenjamin Peterson <benjamin@python.org>
Fri, 27 May 2016 06:19:02 +0000 (23:19 -0700)

Trivial merge