]> granicus.if.org Git - python/commitdiff
Merge from 3.5 to default.
authorLarry Hastings <larry@hastings.org>
Mon, 21 Dec 2015 06:47:04 +0000 (22:47 -0800)
committerLarry Hastings <larry@hastings.org>
Mon, 21 Dec 2015 06:47:04 +0000 (22:47 -0800)

Trivial merge