Merge "config: Improve documentation and behavior of outbound_proxy option." into 13

author zuul <zuul@gerrit.asterisk.org>

Tue, 28 Feb 2017 19:32:22 +0000 (13:32 -0600)

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

Tue, 28 Feb 2017 19:32:22 +0000 (13:32 -0600)
author zuul <zuul@gerrit.asterisk.org>
Tue, 28 Feb 2017 19:32:22 +0000 (13:32 -0600)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 28 Feb 2017 19:32:22 +0000 (13:32 -0600)
diff --cc configs/samples/pjsip.conf.sample
Simple merge
diff --cc res/res_pjsip.c
Simple merge
author	zuul <zuul@gerrit.asterisk.org>
	Tue, 28 Feb 2017 19:32:22 +0000 (13:32 -0600)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Tue, 28 Feb 2017 19:32:22 +0000 (13:32 -0600)
		1	2
configs/samples/pjsip.conf.sample	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_pjsip.c	patch \|	diff1 \|	diff2 \|	blob \| history