From: fabrixxm <fabrix.xm@gmail.com>
Date: Fri, 28 Jan 2011 06:26:57 +0000 (+0100)
Subject: Merge branch 'friendika-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8257b1b684d2c6087a93ae690aa27c907e578aa3;p=friendica.git

Merge branch 'friendika-master'
---

8257b1b684d2c6087a93ae690aa27c907e578aa3