From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 22 Mar 2012 12:38:59 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=19eaed60d57e0db936b4161d1976243cb322efc2;p=friendica.git

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

19eaed60d57e0db936b4161d1976243cb322efc2