Merge "res_pjsip: Split type=identify to IP address and SIP header matching priorities"
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 17 Jan 2018 17:42:03 +0000 (11:42 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 17 Jan 2018 17:42:03 +0000 (11:42 -0600)

Trivial merge