Merge commit '3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8'
authorClément Bœsch <u@pkh.me>
Mon, 3 Apr 2017 18:39:05 +0000 (20:39 +0200)
committerClément Bœsch <u@pkh.me>
Mon, 3 Apr 2017 18:39:05 +0000 (20:39 +0200)
commitbc55e8f08bdd8c688908a0c85eea0e29600613f2
treee5d6f1a45f3ec7fdf152245cae29334cdc80a960
parentee161dac9dccf93fc9dff98da6af00711ec7556c
parent3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8
Merge commit '3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8'

* commit '3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8':
  hlsenc: Fix the openssl support

This commit is a noop, see edc43c571d66b07315f99d00b5ada667fc77b932

Merged-by: Clément Bœsch <u@pkh.me>