]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.6 (#28472)
authorBenjamin Peterson <benjamin@python.org>
Wed, 19 Oct 2016 06:33:24 +0000 (23:33 -0700)
committerBenjamin Peterson <benjamin@python.org>
Wed, 19 Oct 2016 06:33:24 +0000 (23:33 -0700)

Trivial merge