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

Trivial merge