From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 30 Apr 2012 06:40:06 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=36522c43418a1ba4905fc688eb1c84c09c1a9fe1;p=friendica.git

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

36522c43418a1ba4905fc688eb1c84c09c1a9fe1