]> granicus.if.org Git - python/commitdiff
merge from 3.6
authorNed Deily <nad@python.org>
Tue, 13 Sep 2016 15:35:00 +0000 (11:35 -0400)
committerNed Deily <nad@python.org>
Tue, 13 Sep 2016 15:35:00 +0000 (11:35 -0400)

Trivial merge