From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 22 Mar 2011 07:05:10 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendika/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bd60e2ec3f316f58b4fd644e01a5ced13f73865e;p=friendica.git

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

bd60e2ec3f316f58b4fd644e01a5ced13f73865e