From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 24 Jan 2011 12:34:57 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=35918a9f1fd7539156fe4e5edaf2542da0c9931a;p=friendica.git

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

35918a9f1fd7539156fe4e5edaf2542da0c9931a