]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Null merge from 3.5.
authorLarry Hastings <larry@hastings.org>
Mon, 24 Aug 2015 20:00:14 +0000 (13:00 -0700)
committerLarry Hastings <larry@hastings.org>
Mon, 24 Aug 2015 20:00:14 +0000 (13:00 -0700)

Trivial merge