]> granicus.if.org Git - python/commitdiff
Merge heads
authorTerry Jan Reedy <tjreedy@udel.edu>
Sun, 29 May 2016 16:47:38 +0000 (12:47 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sun, 29 May 2016 16:47:38 +0000 (12:47 -0400)

Trivial merge