]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 20 Jul 2015 21:45:38 +0000 (17:45 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 20 Jul 2015 21:45:38 +0000 (17:45 -0400)

Trivial merge