From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 17 Mar 2012 11:29:21 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5fd03583a4f5d8bf0964c7881cbf7a8891513587;p=friendica.git

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

5fd03583a4f5d8bf0964c7881cbf7a8891513587