From: Michael Vogel Date: Thu, 2 Aug 2012 08:27:11 +0000 (+0200) Subject: Merge remote branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b904a21134af433c4fde9f14e1966ed2f51dd2d4;p=friendica.git Merge remote branch 'upstream/master' --- b904a21134af433c4fde9f14e1966ed2f51dd2d4