From: Michael Vogel <icarus@dabo.de>
Date: Mon, 25 Jan 2016 22:51:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into 1601-dfrn
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4208acf4b6bda77e729d18f4fd931ae97aad08ef;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1601-dfrn
---

4208acf4b6bda77e729d18f4fd931ae97aad08ef