From: Michael Vogel Date: Thu, 26 Nov 2015 10:46:58 +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=fc250bbc2041b7571e126ec56974221f3c2f789b;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery --- fc250bbc2041b7571e126ec56974221f3c2f789b