From: Friendika <info@friendika.com>
Date: Mon, 17 Jan 2011 11:02:59 +0000 (-0800)
Subject: Merge branch 'fabrixxm-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=93222142935897d8ddd6289d9ea8736ff0c557f6;p=friendica.git

Merge branch 'fabrixxm-master'
---

93222142935897d8ddd6289d9ea8736ff0c557f6