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

Conflicts:
	plugins/OpenID/openid.php

diff --cc actions/apistatusesdestroy.php
Simple merge

diff --cc classes/Notice.php
Simple merge

diff --cc lib/language.php
index 5a2818133d6979e7fa8e903323851b2549cb3d2a,cb12cca69220711e871bae7ef3db34b0afeda7f8..1805707ad5549f80199b3b6fce0be67f5f0ae58f
--- 1/lib/language.php
--- 2/lib/language.php
+++ b/lib/language.php
@@@ -218,10 -221,9 +222,10 @@@ function _mdomain($backtrace
              } else {
                  // We might be running directly from the plugins dir?
                  // If so, there's no place to store locale info.
-                 return null;
+                 return 'statusnet';
              }
          }
 +        $cached[$path] = $final;
      }
      return $cached[$path];
  }

diff --cc lib/util.php
Simple merge

diff --cc plugins/OpenID/openid.php
index 68851f4eb9fe0b3705333827e1be3e60350ffeb8,8be02e031caef4ee1e969b6f822db0bc68e00245..4ce350f7737a56d0480e6440d4e1f9a6ef0a0148
--- 1/plugins/OpenID/openid.php
--- 2/plugins/OpenID/openid.php
+++ b/plugins/OpenID/openid.php
@@@ -145,11 -144,10 +145,13 @@@ function oid_authenticate($openid_url, 
  
      // Handle failure status return values.
      if (!$auth_request) {
+         common_log(LOG_ERR, __METHOD__ . ": mystery fail contacting $openid_url");
 +        // TRANS: OpenID plugin message. Given when an OpenID is not valid.
          return _m('Not a valid OpenID.');
      } else if (Auth_OpenID::isFailure($auth_request)) {
+         common_log(LOG_ERR, __METHOD__ . ": OpenID fail to $openid_url: $auth_request->message");
 +        // TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
 +        // TRANS: %s is the failure message.
          return sprintf(_m('OpenID failure: %s'), $auth_request->message);
      }
  

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