From: Evan Prodromou <evan@status.net>
Date: Sat, 20 Mar 2010 21:11:42 +0000 (-0500)
Subject: Merge branch 'testing' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e458e9fe6352df6063079979b20a6924f97198f4;p=quix0rs-gnu-social.git

Merge branch 'testing' into 0.9.x

Conflicts:
	lib/activity.php
---

e458e9fe6352df6063079979b20a6924f97198f4