From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 23 Jan 2011 07:43:30 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=60c5e76b2db83038b987b2c54aa21bb9818d2fa1;p=friendica.git

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

60c5e76b2db83038b987b2c54aa21bb9818d2fa1