From: Friendika <info@friendika.com>
Date: Fri, 8 Apr 2011 22:30:54 +0000 (-0700)
Subject: Merge branch 'fabrixxm-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6b66ac818364a4cb5592a0f520396a08feab804f;p=friendica.git

Merge branch 'fabrixxm-master'
---

6b66ac818364a4cb5592a0f520396a08feab804f