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

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

2e9dca7c9f0e50956723505ad576bf32e762d11e