From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 17 Mar 2012 07:44:36 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=96da328acf838faff3fe823f3dd7557d16fe1d8b;p=friendica.git

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

96da328acf838faff3fe823f3dd7557d16fe1d8b