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

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

770d1bb7a368cdaba8e7340b54fd4b13ffea66b8