From: fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 1 Feb 2011 17:46:31 +0000 (+0100)
Subject: Merge branch 'friendika-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9065270694aebeb1bbf4ad10622d0604eac2e0b5;p=friendica.git

Merge branch 'friendika-master'
---

9065270694aebeb1bbf4ad10622d0604eac2e0b5