]> granicus.if.org Git - python/commitdiff
merge with 3.6
authorNed Deily <nad@python.org>
Mon, 10 Oct 2016 19:34:47 +0000 (15:34 -0400)
committerNed Deily <nad@python.org>
Mon, 10 Oct 2016 19:34:47 +0000 (15:34 -0400)

Trivial merge