]> granicus.if.org Git - python/commitdiff
Null-merge from 3.6. Last one--phew!
authorLarry Hastings <larry@hastings.org>
Tue, 3 Jan 2017 02:40:11 +0000 (18:40 -0800)
committerLarry Hastings <larry@hastings.org>
Tue, 3 Jan 2017 02:40:11 +0000 (18:40 -0800)

Trivial merge