fix typo
Merge pull request #1 from manet-marketing/patch-1

fix typo
Merge branch 'master' of github.com:manet-marketing/mantisrb into manet-marketing-master
Hack to by pass crapy ssl key in mantishub service
Merge pull request #3 from testCloud/manet-marketing-master

Manet marketing master
add TLS1 support mantishub
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md