From: Michael Vogel Date: Wed, 21 Jan 2015 00:30:09 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1f23d691f377cc8c3c2ea444b785d28016f3515b;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus --- 1f23d691f377cc8c3c2ea444b785d28016f3515b