]> granicus.if.org Git - python/commitdiff
merge 3.6
authorNed Deily <nad@python.org>
Tue, 11 Oct 2016 00:56:44 +0000 (20:56 -0400)
committerNed Deily <nad@python.org>
Tue, 11 Oct 2016 00:56:44 +0000 (20:56 -0400)

Trivial merge