Merge "res_pjsip: Document tlsv1_1 and tlsv1_2 methods"
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Mon, 22 Jan 2018 14:35:13 +0000 (08:35 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 22 Jan 2018 14:35:13 +0000 (08:35 -0600)

Trivial merge