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

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

011e0c3f8142e3976a4d386fce066c802d4727ab