]> granicus.if.org Git - python/commitdiff
Merge
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 3 Aug 2015 22:41:16 +0000 (18:41 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 3 Aug 2015 22:41:16 +0000 (18:41 -0400)

Trivial merge