From: Michael Vogel <icarus@dabo.de>
Date: Thu, 9 Apr 2015 17:48:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into 1503-load-issues
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=12c034f4cbdeaf5dd131e32da7fc3b5a253bc943;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1503-load-issues
---

12c034f4cbdeaf5dd131e32da7fc3b5a253bc943