From: Michael Vogel Date: Sun, 21 Dec 2014 09:58:43 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=57c3060855dcb26240a1d9ed54cf4715dd8dcc65;p=friendica.git Merge remote-tracking branch 'upstream/master' --- 57c3060855dcb26240a1d9ed54cf4715dd8dcc65