From: Michael Vogel Date: Thu, 15 Nov 2012 20:52:35 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e67062d9cfba398a237f261cc6104e76cc91359b;p=friendica.git Merge remote-tracking branch 'upstream/master' --- e67062d9cfba398a237f261cc6104e76cc91359b