From: Michael Vogel Date: Sat, 17 Nov 2012 13:29:09 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c0376339e0b21d5f9e6608d87f5bcf466351b15e;p=friendica.git Merge remote-tracking branch 'upstream/master' --- c0376339e0b21d5f9e6608d87f5bcf466351b15e