Merge "res_pjsip: Add 'ip' as a valid option to 'identify_by' on endpoint."
authorJoshua Colp <jcolp@digium.com>
Thu, 26 Oct 2017 23:45:40 +0000 (18:45 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 26 Oct 2017 23:45:40 +0000 (18:45 -0500)

Trivial merge