From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 30 Mar 2012 06:12:28 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d22b3a1d9c295f5545cc20e1af786cb79e6553a5;p=friendica.git

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

d22b3a1d9c295f5545cc20e1af786cb79e6553a5