]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorTerry Jan Reedy <tjreedy@udel.edu>
Fri, 12 Jun 2015 19:45:24 +0000 (15:45 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Fri, 12 Jun 2015 19:45:24 +0000 (15:45 -0400)

Trivial merge