]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.5 (#28525)
authorBenjamin Peterson <benjamin@python.org>
Tue, 25 Oct 2016 06:00:18 +0000 (23:00 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 25 Oct 2016 06:00:18 +0000 (23:00 -0700)

Trivial merge