From: Michael Vogel <icarus@dabo.de>
Date: Sun, 17 Jan 2016 23:53:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into 1601-network-performance
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6c7cf2a76677e0fdaee6a5e65d99c443260ca9a6;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1601-network-performance
---

6c7cf2a76677e0fdaee6a5e65d99c443260ca9a6