From: friendica <info@friendica.com>
Date: Wed, 19 Sep 2012 00:44:38 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fa14723ef5fb3aeec8d7a78cff11c6197950615f;p=friendica.git

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

fa14723ef5fb3aeec8d7a78cff11c6197950615f