From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 14 Aug 2012 10:38:06 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d3d2770f3a5dd9c9965d810055e35e7251aa3cb8;p=friendica.git

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

d3d2770f3a5dd9c9965d810055e35e7251aa3cb8