From: Friendika <info@friendika.com>
Date: Sat, 5 Feb 2011 21:06:20 +0000 (-0800)
Subject: Merge branch 'fabrixxm-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d322bb461326adac29e4b3a16d6638de74da2348;p=friendica.git

Merge branch 'fabrixxm-master'
---

d322bb461326adac29e4b3a16d6638de74da2348