From: Evan Prodromou <evan@status.net>
Date: Fri, 25 Mar 2011 19:57:07 +0000 (-0400)
Subject: Merge branch '1.0.x' into limitdist2
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e0d5093ee58f921385eba533adb3f0d21dcf3b49;p=quix0rs-gnu-social.git

Merge branch '1.0.x' into limitdist2

Conflicts:
	lib/groupnoticestream.php
	lib/taggedprofilenoticestream.php
---

e0d5093ee58f921385eba533adb3f0d21dcf3b49