]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
null merge from 3.6
authorNed Deily <nad@python.org>
Tue, 4 Oct 2016 18:52:01 +0000 (14:52 -0400)
committerNed Deily <nad@python.org>
Tue, 4 Oct 2016 18:52:01 +0000 (14:52 -0400)

Trivial merge