From: Michael Vogel Date: Wed, 24 Jun 2015 19:05:38 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into 1506-ostatus-evenbetter X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c66d095389b2f7ea9276d1cc22182ca637b0cead;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1506-ostatus-evenbetter --- c66d095389b2f7ea9276d1cc22182ca637b0cead