From: friendica <info@friendica.com>
Date: Tue, 21 May 2013 00:37:23 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3381afab3dbbd2b867f10caa34d8b76035703760;p=friendica.git

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

3381afab3dbbd2b867f10caa34d8b76035703760