Merge branch '0.9.x' into testing

diff --cc actions/apitimelineuser.php
index 24aa08e27953c42ffe8416f2f8c68a11868c058b,85e8f97b2acfabdbd727f99ebd183bf9b6b4c5c6..c1e66021b6a4046c069bb455dade60ad58ebcd86
--- 1/actions/apitimelineuser.php
--- 2/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@@ -431,10 -434,10 +434,10 @@@ class ApiTimelineUserAction extends Api
                  } else {
                      $group = User_group::staticGet('uri', $uri);
                      if (!empty($group)) {
 -                        $options['groups'] = $uri;
 +                        $options['groups'][] = $uri;
                      } else {
                          // @fixme: hook for discovery here
-                         common_log(LOG_WARNING, sprintf(_('AtomPub post with unknown attention URI %s'), $uri));
+                         common_log(LOG_WARNING, sprintf('AtomPub post with unknown attention URI %s', $uri));
                      }
                  }
              }

diff --cc actions/atompubsubscriptionfeed.php
Simple merge

diff --cc actions/profilesettings.php
Simple merge

diff --cc lib/common.php
Simple merge