]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.5
authorTerry Jan Reedy <tjreedy@udel.edu>
Fri, 12 Jun 2015 20:45:18 +0000 (16:45 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Fri, 12 Jun 2015 20:45:18 +0000 (16:45 -0400)

Trivial merge