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