From: Vasudev Kamath <kamathvasudev@gmail.com>
Date: Sat, 23 Jun 2012 02:41:35 +0000 (+0530)
Subject: Merge branch 'master' of git://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6e4760dd9c512147309b5e4a98d25216610f81da;p=friendica.git

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

6e4760dd9c512147309b5e4a98d25216610f81da