From: root <root@diekershoff.homeunix.net>
Date: Thu, 9 Dec 2010 10:56:26 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=037cd5d80993dedfccfe9ef25679c54297ef1546;p=friendica.git

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

037cd5d80993dedfccfe9ef25679c54297ef1546