From: Michael Vogel <icarus@dabo.de>
Date: Thu, 10 Mar 2016 07:22:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cd0fbc5e9a262dfb46e8278da840a87c47eb3ff0;p=friendica.git

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

cd0fbc5e9a262dfb46e8278da840a87c47eb3ff0