Merge branch '0.7.x' into 0.8.x

diff --combined lib/router.php
index 67b8b8ae6e9515324fda9ac39017cb13f43a55c8,6fb2f94872cbbc3386ecceaad00bc21349cd6352..060253eb54dd3fc943ec5c666c2a305eb69257c5
--- 1/lib/router.php
--- 2/lib/router.php
+++ b/lib/router.php
@@@ -107,6 -107,9 +107,9 @@@ class Route
              $m->connect('main/'.$a, array('action' => $a));
          }
  
+         $m->connect('main/sup/:seconds', array('action' => 'sup'),
+                     array('seconds' => '[0-9]+'));
+ 
          $m->connect('main/tagother/:id', array('action' => 'tagother'));
  
          // these take a code
@@@ -162,12 -165,6 +165,12 @@@
                      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',