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

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

44ff96e0cf64fab4a4b9d8d71beeec485ffea4f3