From: Michael <heluecht@pirati.ca>
Date: Mon, 13 Mar 2017 10:21:08 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4d30f2b292ec0b77de13cae3c622df84f84aa54f;p=friendica.git

Merge remote-tracking branch 'upstream/master'
---

4d30f2b292ec0b77de13cae3c622df84f84aa54f