Merge commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Jun 2015 20:41:53 +0000 (22:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Jun 2015 20:50:19 +0000 (22:50 +0200)
commit21e40f006aac36e41d3d6074928d584f0be51ada
tree61b6f610471fc47a3ac36a0231d9b8e85b3df390
parent12a83bc0aa4bf680805757fd5e025adf3b16c526
parent876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de
Merge commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de'

* commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de':
  configure: don't enable tls protocols if network is disabled

Conflicts:
configure

See: 7fc6545d5d7301196d1c23a45a24a9707bac0060
Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure