From: root <root@diekershoff.homeunix.net>
Date: Thu, 20 Jan 2011 07:17:07 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=030f6f306cba0f025d124fc7a2912a2bafb291be;p=friendica.git

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

030f6f306cba0f025d124fc7a2912a2bafb291be