Merge "sip_to_pjsip: Add cert_file."
authorzuul <zuul@gerrit.asterisk.org>
Fri, 19 Aug 2016 17:39:07 +0000 (12:39 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 19 Aug 2016 17:39:07 +0000 (12:39 -0500)

Trivial merge