From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 12 Mar 2017 13:39:09 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4cddb74f278ec597844080b95319fdb3cf72677a;p=friendica.git

Merge branch 'master' into develop
---

4cddb74f278ec597844080b95319fdb3cf72677a