]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 2.7.15 release branch
authorBenjamin Peterson <benjamin@python.org>
Sun, 29 Apr 2018 22:48:13 +0000 (15:48 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 29 Apr 2018 22:48:13 +0000 (15:48 -0700)

Trivial merge