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

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

e972375403bd019c58478c687443b8c8c68e55d9