From: Michael Vogel Date: Fri, 9 Nov 2012 22:40:17 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=71e43e68d4b31b43126ef46e80875fe949acc276;p=friendica.git Merge remote-tracking branch 'upstream/master' --- 71e43e68d4b31b43126ef46e80875fe949acc276