From: root <root@diekershoff.homeunix.net>
Date: Tue, 21 Dec 2010 06:14:58 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8cfa93b730f87edf98c52e9a38cfa015ce1f5d47;p=friendica.git

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

8cfa93b730f87edf98c52e9a38cfa015ce1f5d47