From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 9 Aug 2011 14:35:15 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=997cad8685ca4e63b3286ea6bd643656adab7466;p=friendica.git

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

997cad8685ca4e63b3286ea6bd643656adab7466