ssl and haproxy
Merge branch 'master' of https://github.com/c2corg/infrastructure into haproxy-https
Merge pull request #1 from c2corg/haproxy-https

merge