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

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

b4b65521fe9546da760c19d8124c4cddd9406a88