From: Joshua Colp <jcolp@digium.com>
Date: Thu, 18 Aug 2016 16:50:00 +0000 (-0500)
Subject: Merge "sip_to_pjsip: Write local_net, contact_acl, contact_deny, and contact_permit... 
X-Git-Tag: 14.1.0-rc1~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9e2be625b13fc062e3da7359418ec2a962f9d45;p=thirdparty%2Fasterisk.git

Merge "sip_to_pjsip: Write local_net, contact_acl, contact_deny, and contact_permit." into 14
---

f9e2be625b13fc062e3da7359418ec2a962f9d45