]> granicus.if.org Git - python/commitdiff
Issue #28835: merge from 3.6
authorNed Deily <nad@python.org>
Tue, 6 Dec 2016 22:13:58 +0000 (17:13 -0500)
committerNed Deily <nad@python.org>
Tue, 6 Dec 2016 22:13:58 +0000 (17:13 -0500)

Trivial merge