Merge "res_pjsip_config_wizard: Add 2 new parameters to help with proxy config"
authorzuul <zuul@gerrit.asterisk.org>
Thu, 30 Mar 2017 22:02:38 +0000 (17:02 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 30 Mar 2017 22:02:38 +0000 (17:02 -0500)

Trivial merge