From: Michael Vogel <icarus@dabo.de>
Date: Fri, 4 Dec 2015 05:05:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=540d2171349ebbb630ceb2f369c7737bd4c329d3;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts
---

540d2171349ebbb630ceb2f369c7737bd4c329d3