From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 17 Apr 2012 16:07:20 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dbff4252d4ac7ccc1cda6b378a53c6761ea4c49d;p=friendica.git

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

dbff4252d4ac7ccc1cda6b378a53c6761ea4c49d