From: Michael Vogel <icarus@dabo.de>
Date: Sat, 12 Mar 2016 10:06:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;ds=sidebyside;h=57fb0a9129326a806cde79f6f3fb5a42d1ef4982;p=friendica.git

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

57fb0a9129326a806cde79f6f3fb5a42d1ef4982