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

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

5f7715529d147510c66d0bf68edcca09e7fe3f1b