]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Tue, 6 Dec 2016 06:31:12 +0000 (22:31 -0800)
committerBenjamin Peterson <benjamin@python.org>
Tue, 6 Dec 2016 06:31:12 +0000 (22:31 -0800)

Trivial merge