]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge 2.7.15 release branch
authorBenjamin Peterson <benjamin@python.org>
Sun, 29 Apr 2018 19:24:24 +0000 (12:24 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 29 Apr 2018 19:24:24 +0000 (12:24 -0700)

Trivial merge