]> granicus.if.org Git - python/commitdiff
Merge heads
authorTerry Jan Reedy <tjreedy@udel.edu>
Wed, 23 Mar 2016 17:40:14 +0000 (13:40 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Wed, 23 Mar 2016 17:40:14 +0000 (13:40 -0400)

Trivial merge