From: Vasudev Kamath <kamathvasudev@gmail.com>
Date: Sun, 12 Feb 2012 09:36:41 +0000 (+0530)
Subject: Merge branch 'master' of git://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=495d0fb80f228e2edf68fb0a52b460851403d379;p=friendica.git

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

495d0fb80f228e2edf68fb0a52b460851403d379