From: friendica <info@friendica.com>
Date: Tue, 1 May 2012 08:19:02 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f8acb329616fbe17f8a0df9cfd84f92503359bce;p=friendica.git

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

f8acb329616fbe17f8a0df9cfd84f92503359bce