From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 21 Jan 2011 06:09:51 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bd512ab60c5128cec449a48e7d0736303f961e89;p=friendica.git

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

bd512ab60c5128cec449a48e7d0736303f961e89