From: Friendika <info@friendika.com>
Date: Wed, 5 Jan 2011 00:42:11 +0000 (-0800)
Subject: Merge branch 'fabrixxm-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=45c1559b38a54a8280b3339c0b1b30be1d7c473d;p=friendica.git

Merge branch 'fabrixxm-master'
---

45c1559b38a54a8280b3339c0b1b30be1d7c473d