]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Null merge from 3.4.
authorLarry Hastings <larry@hastings.org>
Mon, 2 Jan 2017 05:50:33 +0000 (21:50 -0800)
committerLarry Hastings <larry@hastings.org>
Mon, 2 Jan 2017 05:50:33 +0000 (21:50 -0800)

Trivial merge