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