Merge branch '0.9.x' into 1.0.x

diff --cc lib/util.php
Simple merge

diff --cc plugins/BitlyUrl/BitlyUrlPlugin.php
index e1c8d3462eb9b40d69541bf87445b0a27e4262cf,93a35b3f384d85b52e2ed784560e37eed34a5b85..f4d987489ab0a6509a3ec1b2f1b83f692fa2bd29
--- 1/plugins/BitlyUrl/BitlyUrlPlugin.php
--- 2/plugins/BitlyUrl/BitlyUrlPlugin.php
+++ b/plugins/BitlyUrl/BitlyUrlPlugin.php
@@@ -31,9 -33,14 +33,12 @@@ if (!defined('STATUSNET')) 
      exit(1);
  }
  
 -require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php';
 -
  class BitlyUrlPlugin extends UrlShortenerPlugin
  {
-     public $serviceUrl;
+     public $shortenerName = 'bit.ly';
+     public $serviceUrl = 'http://bit.ly/api?method=shorten&version=2.0.1&longUrl=%s';
+     public $login; // To set a site-default when admins or users don't override it.
+     public $apiKey;
  
      function onInitializePlugin(){
          parent::onInitializePlugin();

diff --cc plugins/OStatus/OStatusPlugin.php
Simple merge