From: gerhard6380 <gerhard6380@users.noreply.github.com>
Date: Tue, 9 Aug 2016 14:48:18 +0000 (+0200)
Subject: Merge pull request #1 from friendica/develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0f2e5a468413be79a22c9e3fda28f1293c9d7f0c;p=friendica.git

Merge pull request #1 from friendica/develop

Develop
---

0f2e5a468413be79a22c9e3fda28f1293c9d7f0c