]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Thu, 8 Sep 2016 22:40:49 +0000 (15:40 -0700)
committerBenjamin Peterson <benjamin@python.org>
Thu, 8 Sep 2016 22:40:49 +0000 (15:40 -0700)

Trivial merge