Merge commit 'upstream/0.7.x' into 0.7.x

Conflicts:

	actions/showstream.php

1 files changed, 6 insertions, 0 deletions

diff --git a/actions/usergroups.php b/actions/usergroups.php
index 58cf7eeb6..ded4ba76b 100644
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -125,6 +125,12 @@ class UsergroupsAction extends Action
                        _('Create a new group'));
         $this->elementEnd('p');
 
+        $this->elementStart('p', array('id' => 'group_search'));
+        $this->element('a', array('href' => common_local_url('groupsearch'),
+                                  'class' => 'more'),
+                       _('Search for more groups'));
+        $this->elementEnd('p');
+
         $offset = ($this->page-1) * GROUPS_PER_PAGE;
         $limit =  GROUPS_PER_PAGE + 1;