From: Michael Vogel <icarus@dabo.de>
Date: Mon, 23 Feb 2015 11:34:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into 1502-improved-markdown
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=72cfb86773e090d0afe4246af31e0b81f63308fc;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1502-improved-markdown
---

72cfb86773e090d0afe4246af31e0b81f63308fc