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

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

c5cf9de32a247bbb1757b1f8e30ab3483544fa31