]> granicus.if.org Git - python/commitdiff
Merge
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 21 Sep 2015 23:35:51 +0000 (19:35 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 21 Sep 2015 23:35:51 +0000 (19:35 -0400)

Trivial merge