From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 25 Jan 2011 07:54:10 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/tobiasd/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4c717b38ae8eccaf9fa2ab4e6411b10c2d24afdf;p=friendica.git

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

4c717b38ae8eccaf9fa2ab4e6411b10c2d24afdf