Merge "sip_to_pjsip.py: Fix typo converting outboundproxy registration." into 13

author zuul <zuul@gerrit.asterisk.org>

Tue, 6 Sep 2016 19:19:05 +0000 (14:19 -0500)

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

Tue, 6 Sep 2016 19:19:05 +0000 (14:19 -0500)
author zuul <zuul@gerrit.asterisk.org>
Tue, 6 Sep 2016 19:19:05 +0000 (14:19 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 6 Sep 2016 19:19:05 +0000 (14:19 -0500)
diff --cc contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
Simple merge
author	zuul <zuul@gerrit.asterisk.org>
	Tue, 6 Sep 2016 19:19:05 +0000 (14:19 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Tue, 6 Sep 2016 19:19:05 +0000 (14:19 -0500)