From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 16 Jun 2011 13:30:51 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bca1dcf2d6e243ca803e590168305ed5a232d923;p=friendica.git

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

bca1dcf2d6e243ca803e590168305ed5a232d923