From: root <root@diekershoff.homeunix.net>
Date: Tue, 18 Jan 2011 10:14:28 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=13fa27f7578d292d8d722554ce6211e8e0bc91af;p=friendica.git

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

13fa27f7578d292d8d722554ce6211e8e0bc91af