Merge "contrib/script/sip_to_pjsip: add support for realtime" into 13

author Jenkins2 <jenkins2@gerrit.asterisk.org>

Fri, 16 Feb 2018 16:16:40 +0000 (10:16 -0600)

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

Fri, 16 Feb 2018 16:16:40 +0000 (10:16 -0600)
author Jenkins2 <jenkins2@gerrit.asterisk.org>
Fri, 16 Feb 2018 16:16:40 +0000 (10:16 -0600)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 16 Feb 2018 16:16:40 +0000 (10:16 -0600)
diff --cc contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
Simple merge
author	Jenkins2 <jenkins2@gerrit.asterisk.org>
	Fri, 16 Feb 2018 16:16:40 +0000 (10:16 -0600)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Fri, 16 Feb 2018 16:16:40 +0000 (10:16 -0600)