From: root <root@diekershoff.homeunix.net>
Date: Mon, 24 Jan 2011 12:35:23 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/tobiasd/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7e007b6c07d5395c59797999728fcde288ed79b1;p=friendica.git

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

7e007b6c07d5395c59797999728fcde288ed79b1