From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 28 Jul 2011 15:36:49 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cfc7f8308f5e1756d1ea7b2fadd317821442d16c;p=friendica.git

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

cfc7f8308f5e1756d1ea7b2fadd317821442d16c