From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 15 Mar 2012 05:31:47 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=80b57e664a3df68994108a3d511468b249e0bbff;p=friendica.git

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

80b57e664a3df68994108a3d511468b249e0bbff