]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.5
authorTerry Jan Reedy <tjreedy@udel.edu>
Sat, 9 Jan 2016 17:22:13 +0000 (12:22 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sat, 9 Jan 2016 17:22:13 +0000 (12:22 -0500)

Trivial merge