From: Michael Vogel Date: Fri, 27 Nov 2015 06:30:03 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b45ca806565b64e4f30156f8374f6d0c24a670ee;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery --- b45ca806565b64e4f30156f8374f6d0c24a670ee