From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 17 Feb 2013 10:20:11 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2f22081a64739e7bf6055a5b03e49d13aded77ed;p=friendica.git

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

2f22081a64739e7bf6055a5b03e49d13aded77ed