From: root <root@diekershoff.homeunix.net>
Date: Sat, 8 Jan 2011 07:24:24 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d6b8e8c6a98fb05c9f38f2c323502eb452c031ff;hp=618adb15937843db854a6cc8e7888dad3e81e8a4;p=friendica.git

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