]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' of git://github.com/friendica/friendica
authorVasudev Kamath <kamathvasudev@gmail.com>
Mon, 11 Jun 2012 15:17:11 +0000 (20:47 +0530)
committerVasudev Kamath <kamathvasudev@gmail.com>
Mon, 11 Jun 2012 15:17:11 +0000 (20:47 +0530)

Trivial merge