]> granicus.if.org Git - python/commitdiff
Merge heads.
authorTerry Jan Reedy <tjreedy@udel.edu>
Sat, 23 Aug 2014 22:23:50 +0000 (18:23 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sat, 23 Aug 2014 22:23:50 +0000 (18:23 -0400)

Trivial merge