From: friendica <info@friendica.com>
Date: Mon, 7 May 2012 02:56:27 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8a10af3bce54141be7e03a96f7a9c2df28c7fa5b;p=friendica.git

Merge https://github.com/friendica/friendica into pull
---

8a10af3bce54141be7e03a96f7a9c2df28c7fa5b