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

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

ed6416b4ffcadf8b1a8a5f9d877b506b0e34d6bf