From: Michael Vogel Date: Thu, 24 Jul 2014 20:54:35 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a588ae4022cf3715ac4801a8ed9633b1be1d3dfb;p=friendica.git Merge remote-tracking branch 'upstream/master' --- a588ae4022cf3715ac4801a8ed9633b1be1d3dfb