From: Olaf Conradi Date: Sun, 30 Dec 2012 00:30:00 +0000 (+0100) Subject: Merge branch 'master' into fixes X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c5845be74edd2e48d743772c3dd31e6ad5c2a25e;p=friendica.git Merge branch 'master' into fixes --- c5845be74edd2e48d743772c3dd31e6ad5c2a25e