From: Michael <heluecht@pirati.ca>
Date: Thu, 29 Dec 2016 23:29:01 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1612-diaspora
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5222bd22645d782fb1ae0cc161879e7c1edf938e;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1612-diaspora
---

5222bd22645d782fb1ae0cc161879e7c1edf938e