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

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

624fd4450255e6f3f12eced715ad3d2bdd4016f1