]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorTerry Jan Reedy <tjreedy@udel.edu>
Sun, 15 May 2016 18:20:13 +0000 (14:20 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sun, 15 May 2016 18:20:13 +0000 (14:20 -0400)

Trivial merge