From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 25 Mar 2011 11:47:36 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=af0f3a7e05a76f50b0f6a8c9091e46faf5d37fcd;p=friendica.git

Merge branch 'master' of git://github.com/friendika/friendika
---

af0f3a7e05a76f50b0f6a8c9091e46faf5d37fcd