]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorLarry Hastings <larry@hastings.org>
Mon, 7 Dec 2015 05:58:18 +0000 (21:58 -0800)
committerLarry Hastings <larry@hastings.org>
Mon, 7 Dec 2015 05:58:18 +0000 (21:58 -0800)

Trivial merge