From: root <root@diekershoff.homeunix.net>
Date: Mon, 3 Jan 2011 08:27:13 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f3005918aff04fc435d0f526bf235bd95468294c;p=friendica.git

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

f3005918aff04fc435d0f526bf235bd95468294c