Merge branch 'testing' into 0.9.x

diff --cc plugins/OStatus/OStatusPlugin.php
index a30f68cb363c2a808d489ea79b62d9afe4c1312e,b6c9fa1d4c28b2439255f1af31d6f3f657eaf482..3686c0226d1398b471f314a072c59ad87fbe30a1
--- 1/plugins/OStatus/OStatusPlugin.php
--- 2/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@@ -286,7 -286,20 +286,20 @@@ class OStatusPlugin extends Plugi
      }
  
      function onEndShowStatusNetScripts($action) {
 -        $action->script(common_path('plugins/OStatus/js/ostatus.js'));
 +        $action->script('plugins/OStatus/js/ostatus.js');
          return true;
      }
+ 
+     function onStartNoticeSourceLink($notice, &$name, &$url, &$title)
+     {
+         if ($notice->source == 'ostatus') {
+             $bits = parse_url($notice->uri);
+             $domain = $bits['host'];
+ 
+             $name = $domain;
+             $url = $notice->uri;
+             $title = sprintf(_m("Sent from %s via OStatus"), $domain);
+             return false;
+         }
+     }
  }