From: Vasudev Kamath <kamathvasudev@gmail.com>
Date: Sun, 22 Jul 2012 07:13:32 +0000 (+0530)
Subject: Merge branch 'master' of git://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d3baaadf23ecc44e487716e3908a4a1bc71b401d;p=friendica.git

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

d3baaadf23ecc44e487716e3908a4a1bc71b401d