From: Michael Vogel Date: Sat, 14 Jun 2014 23:49:03 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=724a5192dac60453e173f90f29b3806332a6c438;p=friendica.git Merge remote-tracking branch 'upstream/master' --- 724a5192dac60453e173f90f29b3806332a6c438