From: Michael Vogel Date: Tue, 24 Nov 2015 08:38:46 +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=3b101c9d98a95057943edd1f5b5094d9bd852e3e;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery --- 3b101c9d98a95057943edd1f5b5094d9bd852e3e