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

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

1490f2d3b724348909ff879db4773871dec1cd7f