]> granicus.if.org Git - python/commitdiff
merge tag from 3.6
authorNed Deily <nad@python.org>
Wed, 7 Dec 2016 00:07:19 +0000 (19:07 -0500)
committerNed Deily <nad@python.org>
Wed, 7 Dec 2016 00:07:19 +0000 (19:07 -0500)

Trivial merge