From: Vasudev Kamath <kamathvasudev@gmail.com>
Date: Mon, 11 Jun 2012 15:17:11 +0000 (+0530)
Subject: Merge branch 'master' of git://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=11974b4d948ae5d9b9fb53970838463bd88bb9f6;p=friendica.git

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

11974b4d948ae5d9b9fb53970838463bd88bb9f6