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

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

c0d1caa47d8c714cc2d994fd8b22cf7598612863