From: Joshua Colp <jcolp@digium.com>
Date: Wed, 15 Mar 2017 13:41:49 +0000 (-0500)
Subject: Merge changes from topic 'ASTERISK-26863' into 14
X-Git-Tag: 14.4.0-rc1~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77334fcd6c647f7b30ef9d1af311c593ebe34ea9;p=thirdparty%2Fasterisk.git

Merge changes from topic 'ASTERISK-26863' into 14

* changes:
  res_pjsip_endpoint_identifier_ip: Add an option to match requests by header
  res_pjsip_endpoint_identifier_ip: Clean up a spaces/tabs issue
---

77334fcd6c647f7b30ef9d1af311c593ebe34ea9