]> granicus.if.org Git - python/commitdiff
Merge heads.
authorTerry Jan Reedy <tjreedy@udel.edu>
Thu, 5 Jun 2014 01:01:08 +0000 (21:01 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Thu, 5 Jun 2014 01:01:08 +0000 (21:01 -0400)

Trivial merge