Merge branch '0.9.x' into 1.0.x

Conflicts:
	actions/subscriptions.php
	lib/router.php
	lib/xmppmanager.php
	lib/xmppoutqueuehandler.php

diff --cc EVENTS.txt
Simple merge

diff --cc README
Simple merge

diff --cc actions/apiaccountupdatedeliverydevice.php
Simple merge

diff --cc actions/register.php
Simple merge

diff --cc actions/showstream.php
Simple merge

diff --cc actions/subscriptions.php
index da563a218f06a730aceacfeff31b6894a63cb8f0,ba2f67f2da8e59e18012a27f5032eee8666b4039..45dbaf3b3dc030b5448c2e216f1eddd335de491b
--- 1/actions/subscriptions.php
--- 2/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@@ -207,7 -222,8 +224,8 @@@ class SubscriptionsListItem extends Sub
              }
  
              $this->out->element('input', $attrs);
 -            $this->out->element('label', array('for' => 'jabber-'.$this->profile->id), _('Jabber'));
+             // TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
 +            $this->out->element('label', array('for' => 'jabber-'.$this->profile->id), _('IM'));
          } else {
              $this->out->hidden('jabber', $sub->jabber);
          }

diff --cc classes/Notice_tag.php
Simple merge

diff --cc classes/Profile.php
Simple merge

diff --cc classes/User.php
Simple merge

diff --cc classes/statusnet.ini
Simple merge

diff --cc db/statusnet.sql
Simple merge

diff --cc lib/apiaction.php
Simple merge

diff --cc lib/common.php
Simple merge

diff --cc lib/router.php
index 54d3d0f68bb612f0de76ca4f86d62f0c2fc6c1cd,9aaac7dfe39cb8cbc051ed264868a545b3e8fb0f..32292397e0efd70ad38569f7ffee9d0dc4eca107
--- 1/lib/router.php
--- 2/lib/router.php
+++ b/lib/router.php
@@@ -704,14 -697,7 +710,15 @@@ class Route
              $m->connect('admin/sitenotice', array('action' => 'sitenoticeadminpanel'));
              $m->connect('admin/snapshot', array('action' => 'snapshotadminpanel'));
              $m->connect('admin/license', array('action' => 'licenseadminpanel'));
+ 
 +            $m->connect('admin/plugins', array('action' => 'pluginsadminpanel'));
 +            $m->connect('admin/plugins/enable/:plugin',
 +                        array('action' => 'pluginenable'),
 +                        array('plugin' => '[A-Za-z0-9_]+'));
 +            $m->connect('admin/plugins/disable/:plugin',
 +                        array('action' => 'plugindisable'),
 +                        array('plugin' => '[A-Za-z0-9_]+'));
 +
              $m->connect('getfile/:filename',
                          array('action' => 'getfile'),
                          array('filename' => '[A-Za-z0-9._-]+'));

diff --cc lib/util.php
Simple merge

diff --cc plugins/OpenID/OpenIDPlugin.php
Simple merge