From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 11 Jun 2011 06:33:02 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4d3c6941cafb3b8a7e1d2ccccd5003a2dc468a4d;p=friendica.git

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

4d3c6941cafb3b8a7e1d2ccccd5003a2dc468a4d