]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorLarry Hastings <larry@hastings.org>
Mon, 27 Jun 2016 02:43:00 +0000 (19:43 -0700)
committerLarry Hastings <larry@hastings.org>
Mon, 27 Jun 2016 02:43:00 +0000 (19:43 -0700)

Trivial merge