From: root <root@diekershoff.homeunix.net>
Date: Mon, 27 Dec 2010 03:43:35 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b39f2e3fac3c6396e2dd9ce7188d97ee3ba7b82f;p=friendica.git

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

b39f2e3fac3c6396e2dd9ce7188d97ee3ba7b82f