From: root <root@diekershoff.homeunix.net>
Date: Sat, 1 Jan 2011 12:00:50 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e024360d44c666072b0b5e7a035cef1e00a043ee;p=friendica.git

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

e024360d44c666072b0b5e7a035cef1e00a043ee