From: Michael Vogel <icarus@dabo.de>
Date: Sun, 6 Sep 2015 07:15:23 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into 1509-diaspora-import
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d20dbedddd4bf6ebb511f82e41026896b8026d6e;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1509-diaspora-import
---

d20dbedddd4bf6ebb511f82e41026896b8026d6e