From: Michael Vogel <icarus@dabo.de>
Date: Mon, 2 Mar 2015 06:37:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into 1503-hashtag-handling
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3b9a8daeeb2994cbf8f88dd07aa8334ca6527fde;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1503-hashtag-handling
---

3b9a8daeeb2994cbf8f88dd07aa8334ca6527fde