Merge branch 'master' into 0.9.x

Conflicts:
	classes/Notice.php

diff --cc classes/Notice.php
index 606803b6f99c1e8ea2bf1e60d37e4b81e04291e6,36943be84b044f7a57c2e0626cf42dabc2af9035..12467c8501379fe0fb991a11cf2837b1db5a51ee
--- 1/classes/Notice.php
--- 2/classes/Notice.php
+++ b/classes/Notice.php
@@@ -281,8 -275,7 +281,9 @@@ class Notice extends Memcached_DataObje
  
          if (!$profile->hasRight(Right::NEWNOTICE)) {
              common_log(LOG_WARNING, "Attempted post from user disallowed to post: " . $profile->nickname);
-             throw new ClientException(_('You are banned from posting notices on this site.'));
++
 +            // TRANS: Client exception thrown when a user tries to post while being banned.
+             throw new ClientException(_('You are banned from posting notices on this site.'), 403);
          }
  
          $notice = new Notice();