]> granicus.if.org Git - python/commitdiff
Null merge from 3.6.
authorLarry Hastings <larry@hastings.org>
Fri, 20 Jan 2017 02:46:07 +0000 (18:46 -0800)
committerLarry Hastings <larry@hastings.org>
Fri, 20 Jan 2017 02:46:07 +0000 (18:46 -0800)

Trivial merge