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

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

079fdecff1f4daa534045f4bd857e6ae6324474d