From: Thomas Willingham Date: Fri, 12 Oct 2012 20:35:32 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/friendica/friendica X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a12600587709b10cfdb674f6f428290e221ac6f3;p=friendica.git Merge branch 'master' of https://github.com/friendica/friendica --- a12600587709b10cfdb674f6f428290e221ac6f3