From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 6 Jun 2017 10:20:55 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f3d8da7d3303b72e7b775498663a57501bfc49c2;p=friendica.git

Merge branch 'master' into develop
---

f3d8da7d3303b72e7b775498663a57501bfc49c2