From: Evan Prodromou <evan@status.net>
Date: Mon, 26 Sep 2011 21:11:49 +0000 (-0400)
Subject: Merge commit 'refs/merge-requests/158' of git://gitorious.org/statusnet/mainline... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8c710ad2c1b80544acccb515f7b601aadff2de16;p=quix0rs-gnu-social.git

Merge commit 'refs/merge-requests/158' of git://gitorious.org/statusnet/mainline into merge-requests/158

Conflicts:
	classes/Profile_list.php
	lib/peopletagnoticestream.php
---

8c710ad2c1b80544acccb515f7b601aadff2de16