From: Joshua Colp <jcolp@digium.com>
Date: Thu, 26 Oct 2017 23:28:13 +0000 (-0500)
Subject: Merge "res_pjsip: Add 'ip' as a valid option to 'identify_by' on endpoint." into 13
X-Git-Tag: 13.19.0-rc1~186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40d30cd70e5738759a3d61890d36b5873bd1daa1;p=thirdparty%2Fasterisk.git

Merge "res_pjsip: Add 'ip' as a valid option to 'identify_by' on endpoint." into 13
---

40d30cd70e5738759a3d61890d36b5873bd1daa1