Merge branch '0.7.x' into 0.8.x

diff --cc db/laconica.sql
Simple merge

diff --cc lib/action.php
Simple merge

diff --cc lib/router.php
index 4c036e7b245803550b71de5fa245fbb2141c238c,4b70c01505ec3163454db89f01ab8a498a270a64..1d1a5ba4c0e14f6fefb3c5345462157064be8e1c
--- 1/lib/router.php
--- 2/lib/router.php
+++ b/lib/router.php
@@@ -143,13 -153,8 +153,14 @@@ class Route
                      array('action' => 'deletenotice'),
                      array('notice' => '[0-9]+'));
  
 +        // conversation
 +
 +        $m->connect('conversation/:id',
 +                    array('action' => 'conversation'),
 +                    array('id' => '[0-9]+'));
 +
          $m->connect('message/new', array('action' => 'newmessage'));
+         $m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => '[A-Za-z0-9_-]'));
          $m->connect('message/:message',
                      array('action' => 'showmessage'),
                      array('message' => '[0-9]+'));