From: Friendika Date: Fri, 7 Jan 2011 10:59:01 +0000 (-0800) Subject: Merge branch 'master' of file:///home/macgirvin/friendika/friendika X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=65989470495ef1f45387bdec9779cf644f9a028c;p=friendica.git Merge branch 'master' of file:///home/macgirvin/friendika/friendika --- 65989470495ef1f45387bdec9779cf644f9a028c