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

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

8e07525dfb47cfb8bf04d51ebcde51c83b8d41ca