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

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

2f532f579c8b3a7052f67c72af901bf2926a85bf