]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.5 (#24963)
authorBenjamin Peterson <benjamin@python.org>
Sun, 30 Aug 2015 21:42:59 +0000 (14:42 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 30 Aug 2015 21:42:59 +0000 (14:42 -0700)

Trivial merge