]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorLarry Hastings <larry@hastings.org>
Sun, 6 Dec 2015 00:49:19 +0000 (16:49 -0800)
committerLarry Hastings <larry@hastings.org>
Sun, 6 Dec 2015 00:49:19 +0000 (16:49 -0800)

Trivial merge