]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.5
authorNed Deily <nad@python.org>
Fri, 23 Dec 2016 09:15:34 +0000 (04:15 -0500)
committerNed Deily <nad@python.org>
Fri, 23 Dec 2016 09:15:34 +0000 (04:15 -0500)

Trivial merge