From: Friendika <info@friendika.com>
Date: Mon, 27 Dec 2010 21:06:20 +0000 (-0800)
Subject: Merge branch 'fabrixxm-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2e19af4b1e23691abc33e0b5a5af5adae36aec42;p=friendica.git

Merge branch 'fabrixxm-master'
---

2e19af4b1e23691abc33e0b5a5af5adae36aec42