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

Trivial merge