]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.6
authorBenjamin Peterson <benjamin@python.org>
Thu, 6 Oct 2016 06:32:20 +0000 (23:32 -0700)
committerBenjamin Peterson <benjamin@python.org>
Thu, 6 Oct 2016 06:32:20 +0000 (23:32 -0700)

Trivial merge