From: root <root@diekershoff.homeunix.net>
Date: Sun, 2 Jan 2011 09:35:52 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0b4a6f8eaca0d1396e7e944cd4735a573bd1d111;p=friendica.git

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

0b4a6f8eaca0d1396e7e944cd4735a573bd1d111