From: Michael Vogel <icarus@dabo.de>
Date: Tue, 7 Jun 2016 04:12:28 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into 1606-database
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c7ab2d24824d33dc80d967b34217dc4ce1986c31;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1606-database
---

c7ab2d24824d33dc80d967b34217dc4ce1986c31