]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorLarry Hastings <larry@hastings.org>
Mon, 24 Aug 2015 19:58:57 +0000 (12:58 -0700)
committerLarry Hastings <larry@hastings.org>
Mon, 24 Aug 2015 19:58:57 +0000 (12:58 -0700)

Trivial merge