Merge "declare optional openssl dependencies in moduleinfo"
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Mon, 16 Oct 2017 14:19:56 +0000 (09:19 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 16 Oct 2017 14:19:56 +0000 (09:19 -0500)
1  2 
main/tcptls.c

diff --cc main/tcptls.c
Simple merge