From: root <root@diekershoff.homeunix.net>
Date: Wed, 19 Jan 2011 16:55:27 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8e22c669a0668fc0498e9c1d822dcefd97bae1e5;hp=-c;p=friendica.git

Merge branch 'master' of git://github.com/friendika/friendika
---

8e22c669a0668fc0498e9c1d822dcefd97bae1e5