From: Michael Vogel <icarus@dabo.de>
Date: Tue, 24 Feb 2015 09:24:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into 1502-improved-markdown
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=671a36682a417da7ab322e705338eb5fa1ef8004;p=friendica.git

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

671a36682a417da7ab322e705338eb5fa1ef8004