]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorTerry Jan Reedy <tjreedy@udel.edu>
Thu, 12 Nov 2015 20:25:07 +0000 (15:25 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Thu, 12 Nov 2015 20:25:07 +0000 (15:25 -0500)

Trivial merge