From: Evan Prodromou <evan@status.net>
Date: Wed, 22 Dec 2010 20:09:42 +0000 (-0800)
Subject: Merge branch '0.9.x' into socialbookmark
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=402cac2f93d6ccb89abf0e8a314e3f69d597b898;p=quix0rs-gnu-social.git

Merge branch '0.9.x' into socialbookmark

Conflicts:
	lib/activityobject.php
---

402cac2f93d6ccb89abf0e8a314e3f69d597b898