From: Michael Vogel Date: Fri, 25 May 2012 14:19:10 +0000 (+0200) Subject: Merge remote branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a71e3134bf7250b60cafd1e51098eea70c3459de;p=friendica.git Merge remote branch 'upstream/master' --- a71e3134bf7250b60cafd1e51098eea70c3459de