From: Michael Vogel <icarus@dabo.de>
Date: Mon, 10 Aug 2015 08:52:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into 1508-public-relay
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c8e0685788a26811af63f3127ecff0c9f1712ca4;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1508-public-relay
---

c8e0685788a26811af63f3127ecff0c9f1712ca4