From: root <root@diekershoff.homeunix.net>
Date: Sat, 25 Dec 2010 18:11:39 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c6a93d5cec05e9282b2f2d26fdfbc93175ed2b06;p=friendica.git

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

c6a93d5cec05e9282b2f2d26fdfbc93175ed2b06