]> granicus.if.org Git - python/commitdiff
Null merge from 3.5.
authorLarry Hastings <larry@hastings.org>
Mon, 23 Nov 2015 07:46:02 +0000 (23:46 -0800)
committerLarry Hastings <larry@hastings.org>
Mon, 23 Nov 2015 07:46:02 +0000 (23:46 -0800)

Trivial merge