From: Michael Vogel Date: Wed, 1 Aug 2012 22:20:44 +0000 (+0200) Subject: Merge remote branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=47396b1d284dffbb994233597cb9fca8a1e33be7;p=friendica-addons.git Merge remote branch 'upstream/master' --- 47396b1d284dffbb994233597cb9fca8a1e33be7