From: friendica <info@friendica.com>
Date: Tue, 2 Sep 2014 04:46:40 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7673579afc55813950d9e86237acd2a2f74e4ae2;p=friendica.git

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

7673579afc55813950d9e86237acd2a2f74e4ae2