From: Michael Vogel Date: Thu, 25 Dec 2014 00:56:40 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0cafc59f1b59ce361911d3d3a3ca2640671a21e4;p=friendica.git Merge remote-tracking branch 'upstream/master' --- 0cafc59f1b59ce361911d3d3a3ca2640671a21e4