]> granicus.if.org Git - python/commitdiff
Merge heads.
authorTerry Jan Reedy <tjreedy@udel.edu>
Sun, 8 Jun 2014 18:49:07 +0000 (14:49 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sun, 8 Jun 2014 18:49:07 +0000 (14:49 -0400)

Trivial merge