merge from testing

diff --cc README
Simple merge

diff --cc lib/util.php
index e9ae2bd50e424a27d5585fc2696c126f8df432ef,047faeef0d5653a1b526c1943e890d96ea8f287c..e641afd4db69a537df3465f2a709c025aa941ef3
--- 1/lib/util.php
--- 2/lib/util.php
+++ b/lib/util.php
@@@ -401,10 -391,10 +401,10 @@@ function common_render_content($text, $
  {
      $r = common_render_text($text);
      $id = $notice->profile_id;
-     $r = preg_replace('/(^|[\s\.\,\:\;]+)@([A-Za-z0-9]{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
+     $r = preg_replace('/(^|\s+)@(['.NICKNAME_FMT.']{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
      $r = preg_replace('/^T ([A-Z0-9]{1,64}) /e', "'T '.common_at_link($id, '\\1').' '", $r);
 -    $r = preg_replace('/(^|\s+)@#([A-Za-z0-9]{1,64})/e', "'\\1@#'.common_at_hash_link($id, '\\2')", $r);
 -    $r = preg_replace('/(^|\s)!([A-Za-z0-9]{1,64})/e', "'\\1!'.common_group_link($id, '\\2')", $r);
 +    $r = preg_replace('/(^|[\s\.\,\:\;]+)@#([A-Za-z0-9]{1,64})/e', "'\\1@#'.common_at_hash_link($id, '\\2')", $r);
 +    $r = preg_replace('/(^|[\s\.\,\:\;]+)!([A-Za-z0-9]{1,64})/e', "'\\1!'.common_group_link($id, '\\2')", $r);
      return $r;
  }
  

diff --cc scripts/maildaemon.php
Simple merge