From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Wed, 1 Jun 2011 16:34:10 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ef77d53782d0bbd0bf7ee2b823726ab5d3f77f5a;p=friendica.git

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

ef77d53782d0bbd0bf7ee2b823726ab5d3f77f5a