]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorTerry Jan Reedy <tjreedy@udel.edu>
Wed, 18 May 2016 02:48:34 +0000 (22:48 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Wed, 18 May 2016 02:48:34 +0000 (22:48 -0400)

Trivial merge