From: friendica <info@friendica.com>
Date: Sun, 21 Oct 2012 21:44:32 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c2af58da0140a3985a3bb611ba0f98cb07a9de23;p=friendica.git

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

c2af58da0140a3985a3bb611ba0f98cb07a9de23