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

author Joshua Colp <jcolp@digium.com>

Thu, 18 Aug 2016 16:49:47 +0000 (11:49 -0500)

committer Gerrit Code Review <gerrit2@gerrit.digium.api>

Thu, 18 Aug 2016 16:49:47 +0000 (11:49 -0500)
author Joshua Colp <jcolp@digium.com>
Thu, 18 Aug 2016 16:49:47 +0000 (11:49 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 18 Aug 2016 16:49:47 +0000 (11:49 -0500)
diff --cc contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Thu, 18 Aug 2016 16:49:47 +0000 (11:49 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Thu, 18 Aug 2016 16:49:47 +0000 (11:49 -0500)