From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 16 Feb 2013 10:03:56 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dfce513c4ba9656ce24c9c90a26479ecabee203b;p=friendica.git

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

dfce513c4ba9656ce24c9c90a26479ecabee203b