From: root <root@diekershoff.homeunix.net>
Date: Fri, 21 Jan 2011 11:20:22 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/tobiasd/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fdddf93ccc78c7f291be54f04b511983ec6fe030;p=friendica.git

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

fdddf93ccc78c7f291be54f04b511983ec6fe030