From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 22 Feb 2013 15:05:11 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6db780dd335dcdb740ae1c55fc89f72f92acff52;p=friendica.git

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

6db780dd335dcdb740ae1c55fc89f72f92acff52