From: Michael Vogel <icarus@dabo.de>
Date: Fri, 10 Apr 2015 09:34:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into 1504-unified-follow
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=190b7d6070d3a72ddcf1fa994ee6ba57ed9255f2;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1504-unified-follow
---

190b7d6070d3a72ddcf1fa994ee6ba57ed9255f2