Merge branch '0.7.x' into 0.8.x

Conflicts:

	classes/Notice.php
	lib/action.php
	lib/router.php
	lib/twitter.php

1 files changed, 1 insertions, 1 deletions

diff --git a/actions/favorited.php b/actions/favorited.php
index 5082f4a4e..231b97897 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -178,7 +178,7 @@ class FavoritedAction extends Action
         $qry = 'SELECT notice.*, '.
           $weightexpr . ' as weight ' .
           'FROM notice JOIN fave ON notice.id = fave.notice_id ' .
-          'GROUP BY fave.notice_id ' .
+          'GROUP BY id,profile_id,uri,content,rendered,url,created,notice.modified,reply_to,is_local,source ' .
           'ORDER BY weight DESC';
 
         $offset = ($this->page - 1) * NOTICES_PER_PAGE;