From: Michael Vogel Date: Wed, 9 May 2012 12:56:48 +0000 (+0200) Subject: Merge remote branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f2e648d62fe7cafb9a55c7505687ea4d1c294778;p=friendica.git Merge remote branch 'upstream/master' --- f2e648d62fe7cafb9a55c7505687ea4d1c294778