Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing

diff --cc actions/groupmembers.php
index 6d0701239ffd26a56318b3fbc2353e837fbc6da8,e72ef371acad7fe36fc67e1d9c96eb2c1d3b16fd..54f1d8dcda748e8fb112c6042e9d4a14ac1f0ca7
--- 1/actions/groupmembers.php
--- 2/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@@ -241,24 -245,9 +243,26 @@@ class GroupMemberListItem extends Profi
          if (common_config('nofollow', 'members')) {
              $aAttrs['rel'] = 'nofollow';
          }
+ 
+         return $aAttrs;
      }
 +
 +    /**
 +     * Fetch necessary return-to arguments for the profile forms
 +     * to return to this list when they're done.
 +     * 
 +     * @return array
 +     */
 +    protected function returnToArgs()
 +    {
 +        $args = array('action' => 'groupmembers',
 +                      'nickname' => $this->group->nickname);
 +        $page = $this->out->arg('page');
 +        if ($page) {
 +            $args['param-page'] = $page;
 +        }
 +        return $args;
 +    }
  }
  
  /**

diff --cc actions/subscribers.php
Simple merge