From: Michael Vogel Date: Fri, 29 May 2015 08:55:07 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into 1505-ostatus X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=594f3e28159d30f22ea2ce2147faf3eebdcbffa3;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1505-ostatus --- 594f3e28159d30f22ea2ce2147faf3eebdcbffa3