Merge branch '0.9.x' into 1.0.x

diff --cc actions/hostmeta.php
index be73665f2962b708a1345a4555245d0bc46381a7,0000000000000000000000000000000000000000..b7beee5a86d75faff99031962d079ff63a484dab
mode 100644,000000..100644
--- 1/actions/hostmeta.php
--- /dev/null
+++ b/actions/hostmeta.php
@@@ -1,58 -1,0 +1,60 @@@
- if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 +<?php
 +/*
 + * StatusNet - the distributed open-source microblogging tool
 + * Copyright (C) 2010, StatusNet, Inc.
 + *
 + * This program is free software: you can redistribute it and/or modify
 + * it under the terms of the GNU Affero General Public License as published by
 + * the Free Software Foundation, either version 3 of the License, or
 + * (at your option) any later version.
 + *
 + * This program is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + * GNU Affero General Public License for more details.
 + *
 + * You should have received a copy of the GNU Affero General Public License
 + * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 + */
 +
 +/**
 + * @category Action
 + * @package  StatusNet
 + * @maintainer James Walker <james@status.net>
 + * @author   Craig Andrews <candrews@integralblue.com>
 + */
 +
++if (!defined('STATUSNET')) {
++    exit(1);
++}
 +
 +class HostMetaAction extends Action
 +{
 +
 +    /**
 +     * Is read only?
 +     *
 +     * @return boolean true
 +     */
 +    function isReadOnly()
 +    {
 +        return true;
 +    }
 +
 +    function handle()
 +    {
 +        parent::handle();
 +
 +        $domain = common_config('site', 'server');
 +
 +        $xrd = new XRD();
 +        $xrd->host = $domain;
 +
 +        if(Event::handle('StartHostMetaLinks', array(&$xrd->links))) {
 +            Event::handle('EndHostMetaLinks', array(&$xrd->links));
 +        }
 +
 +        header('Content-type: application/xrd+xml');
 +        print $xrd->toXML();
 +    }
 +}

diff --cc plugins/Imap/imapmanager.php
Simple merge

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

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