]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorTerry Jan Reedy <tjreedy@udel.edu>
Sat, 21 Nov 2015 05:05:35 +0000 (00:05 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sat, 21 Nov 2015 05:05:35 +0000 (00:05 -0500)

Trivial merge