]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge from 3.5.
authorEric Snow <ericsnowcurrently@gmail.com>
Sat, 30 May 2015 18:55:22 +0000 (12:55 -0600)
committerEric Snow <ericsnowcurrently@gmail.com>
Sat, 30 May 2015 18:55:22 +0000 (12:55 -0600)

Trivial merge