From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 22 Mar 2012 05:27:13 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5189a56ef832e1c5c6976f87d77d218bf4a6c221;p=friendica.git

Merge branch 'master' of https://github.com/friendica/friendica
---

5189a56ef832e1c5c6976f87d77d218bf4a6c221