Merge commit '29216d7fd14d1cec16821867d17c90b5c49e8c07'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 09:52:21 +0000 (11:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 09:54:16 +0000 (11:54 +0200)
commit1617a89cf000cfb811c1c1ae4119321f41b9fbf7
tree05195641ff0ce9dc6b88ad8e5b8b4910fa47cf8d
parente91fbfd9cf17270d78c73add53fada4c217fdb5e
parent29216d7fd14d1cec16821867d17c90b5c49e8c07
Merge commit '29216d7fd14d1cec16821867d17c90b5c49e8c07'

* commit '29216d7fd14d1cec16821867d17c90b5c49e8c07':
  tls: fix compilation when both gnutls and openssl are enabled

See: e91fbfd9cf17270d78c73add53fada4c217fdb5e
Merged-by: Michael Niedermayer <michaelni@gmx.at>