From: Friendika <info@friendika.com>
Date: Sun, 6 Feb 2011 21:27:52 +0000 (-0800)
Subject: Merge branch 'fabrixxm-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8e988341d01de0b061a9d14846c660e7e76d80db;p=friendica.git

Merge branch 'fabrixxm-master'
---

8e988341d01de0b061a9d14846c660e7e76d80db