From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Wed, 14 Mar 2012 06:20:13 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4fcdada4320d5d5619eb3a1f517d0fea6b26857b;p=friendica.git

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

4fcdada4320d5d5619eb3a1f517d0fea6b26857b