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

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

ebb8186191d46f6b264d09f886d5574761194685