Merge branch '0.7.x' into 0.8.x

diff --cc README
Simple merge

diff --cc db/laconica.sql
index 0d66716053caa5190028f7d46c005b64ff6275eb,a790a3fd27cca512c8e9d3bc543905f5ef90d8cf..20f0cabd17c070e2ad2ae5b4cdd96b06a3abcb87
--- 1/db/laconica.sql
--- 2/db/laconica.sql
+++ b/db/laconica.sql
@@@ -115,13 -114,11 +114,13 @@@ create table notice 
      reply_to integer comment 'notice replied to (usually a guess)' references notice (id),
      is_local tinyint default 0 comment 'notice was generated by a user',
      source varchar(32) comment 'source of comment, like "web", "im", or "clientname"',
 +    conversation integer comment 'id of root notice in this conversation' references notice (id),
  
      index notice_profile_id_idx (profile_id),
 +    index notice_conversation_idx (conversation),
      index notice_created_idx (created),
      FULLTEXT(content)
- ) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_bin;
+ ) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci;
  
  create table notice_source (
       code varchar(32) primary key not null comment 'source code',

diff --cc lib/action.php
Simple merge