From: Michael <heluecht@pirati.ca>
Date: Fri, 14 Apr 2017 22:30:48 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into issue-3326
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e7783e201801b279d50869ffd0f0d93bb8664e9f;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into issue-3326
---

e7783e201801b279d50869ffd0f0d93bb8664e9f