From: Michael Vogel Date: Wed, 16 May 2012 06:24:46 +0000 (+0200) Subject: Merge remote branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f2c0c40f6e488f1a8e62bda9449b28115f343cac;p=friendica.git Merge remote branch 'upstream/master' --- f2c0c40f6e488f1a8e62bda9449b28115f343cac