]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorTerry Jan Reedy <tjreedy@udel.edu>
Sun, 17 Jan 2016 04:44:16 +0000 (23:44 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sun, 17 Jan 2016 04:44:16 +0000 (23:44 -0500)

Trivial merge