From: Friendika <info@friendika.com>
Date: Thu, 6 Jan 2011 20:42:29 +0000 (-0800)
Subject: Merge branch 'fabrixxm-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=166424c92eafa55045b8e52f55a7ec7128062397;p=friendica.git

Merge branch 'fabrixxm-master'
---

166424c92eafa55045b8e52f55a7ec7128062397