]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.6 (closes #28184)
authorBenjamin Peterson <benjamin@python.org>
Tue, 20 Sep 2016 05:17:44 +0000 (22:17 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 20 Sep 2016 05:17:44 +0000 (22:17 -0700)

Trivial merge