]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorTerry Jan Reedy <tjreedy@udel.edu>
Wed, 27 Jan 2016 16:52:13 +0000 (11:52 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Wed, 27 Jan 2016 16:52:13 +0000 (11:52 -0500)

Trivial merge