From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Wed, 16 Mar 2011 05:52:33 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c43f647049c78b594c90e95d06d12f29f300d5d3;p=friendica.git

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

c43f647049c78b594c90e95d06d12f29f300d5d3