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

Trivial merge