fix XSS vulnerability in conversations#new, closes #4010
Merge branch 'hotfix/0.0.3.2'
Merge branch 'master' of git://github.com/diaspora/diaspora
bundler should communicate with rubygems using ssl
release 0.0.3.3
Merge branch 'hotfix/0.0.3.3'
Merge branch 'master' of git://github.com/diaspora/diaspora