]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Sat, 16 Apr 2016 22:02:29 +0000 (15:02 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sat, 16 Apr 2016 22:02:29 +0000 (15:02 -0700)

Trivial merge