]> granicus.if.org Git - python/commitdiff
Null merge from 3.6
authorNed Deily <nad@python.org>
Sat, 17 Dec 2016 04:17:52 +0000 (23:17 -0500)
committerNed Deily <nad@python.org>
Sat, 17 Dec 2016 04:17:52 +0000 (23:17 -0500)

Trivial merge