Merge to:
telepathy-salut
From:
/home/sjoerd/telepathy-salut-sjoerd
Changes:
Laurent Bigonville <bigon at bigon.be>
configure.ac: readd lost enable_ssl variable
Laurent Bigonville <bigon at bigon.be>
configure.ac: add a flag to control openssl support