From: Michael Vogel Date: Sun, 6 Mar 2016 19:37:51 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1603-ostatus-completion X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=27905cc21a523d052a0148c9802a64d6dfd9d0d2;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1603-ostatus-completion --- 27905cc21a523d052a0148c9802a64d6dfd9d0d2