Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

diff --cc lib/command.php
index db8e8003041f0d2cdfc35cc10d8a259b42364e7a,9d550550f75562849873ce0177966dc4e937e444..0b3b3c95a21a4cd20472a4ef5d08474a8ce08d32
--- 1/lib/command.php
--- 2/lib/command.php
+++ b/lib/command.php
@@@ -668,37 -711,9 +711,37 @@@ class LoginCommand extends Comman
      }
  }
  
 +class LoseCommand extends Command
 +{
 +
 +    var $other = null;
 +
 +    function __construct($user, $other)
 +    {
 +        parent::__construct($user);
 +        $this->other = $other;
 +    }
 +
 +    function execute($channel)
 +    {
 +        if(!$this->other) {
 +            $channel->error($this->user, _('Specify the name of the user to unsubscribe from'));
 +            return;
 +        }
 +
 +        $result=subs_unsubscribe_from($this->user, $this->other);
 +
 +        if ($result) {
 +            $channel->output($this->user, sprintf(_('Unsubscribed  %s'), $this->other));
 +        } else {
 +            $channel->error($this->user, $result);
 +        }
 +    }
 +}
 +
  class SubscriptionsCommand extends Command
  {
-     function execute($channel)
+     function handle($channel)
      {
          $profile = $this->user->getSubscriptions(0);
          $nicknames=array();

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