Merge "res_pjsip: Use pjsip_sip_uri.user_param instead of other_param"
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Mon, 19 Feb 2018 14:54:56 +0000 (08:54 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 19 Feb 2018 14:54:56 +0000 (08:54 -0600)

Trivial merge