From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 7 Oct 2013 05:46:39 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8bd6858bfa023f5c87a92e80c45f0dafb6a1e955;p=friendica.git

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

8bd6858bfa023f5c87a92e80c45f0dafb6a1e955