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

2010-04-26 02:43:33 -04:00
parent 14adb7cc41 d7d3a50d87
commit 5c05cd2b1a
149 changed files with 47567 additions and 23380 deletions
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -100,6 +100,7 @@ class HTMLOutputter extends XMLOutputter
            $type = common_negotiate_type($cp, $sp);

            if (!$type) {
+                // TRANS: Client exception 406
                throw new ClientException(_('This page is not available in a '.
                                            'media type you accept'), 406);
            }