From: Michael Vogel Date: Mon, 24 Aug 2015 17:22:05 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into 1508-poco-ostatus X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4659a09b53035abcad7a28d5685415b38fbd4aaf;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1508-poco-ostatus --- 4659a09b53035abcad7a28d5685415b38fbd4aaf