Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline

Conflicts:
	actions/public.php

diff --cc lib/action.php
index 31b5aa49547fd232cdce9a4f357541de71ce4339,fce59ba8a008f54583f400e7721ee4cbbc8d1c61..9e84e050ef759fe80ecc388b6e8214ef2d29e05d
--- 1/lib/action.php
--- 2/lib/action.php
+++ b/lib/action.php
@@@ -935,10 -960,9 +960,9 @@@ class Action extends HTMLOutputter // l
          // TRANS: Make sure there is no whitespace between "]" and "(".
          // TRANS: Text between [] is a link description, text between () is the link itself.
          // TRANS: %s is the version of StatusNet that is being used.
 -        $instr .= sprintf(_('It runs the [StatusNet](http://status.net/) microblogging software, version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), STATUSNET_VERSION);
 +        $instr .= sprintf(_('It runs on [GNU social](http://www.gnu.org/software/social/), version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), STATUSNET_VERSION);
          $output = common_markup_to_html($instr);
          $this->raw($output);
-         $this->elementEnd('dd');
          // do it
      }
  

diff --cc locale/ca/LC_MESSAGES/statusnet.po
Simple merge

diff --cc plugins/OStatus/actions/ostatusinit.php
Simple merge