]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.6
authorBenjamin Peterson <benjamin@python.org>
Fri, 23 Sep 2016 06:40:08 +0000 (23:40 -0700)
committerBenjamin Peterson <benjamin@python.org>
Fri, 23 Sep 2016 06:40:08 +0000 (23:40 -0700)

Trivial merge