Merge "pjsip: Extend 'asymmetric_rtp_codec' option to include us changing." into 14

author Joshua Colp <jcolp@digium.com>

Tue, 13 Jun 2017 14:26:02 +0000 (09:26 -0500)

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

Tue, 13 Jun 2017 14:26:02 +0000 (09:26 -0500)
author Joshua Colp <jcolp@digium.com>
Tue, 13 Jun 2017 14:26:02 +0000 (09:26 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 13 Jun 2017 14:26:02 +0000 (09:26 -0500)
diff --cc CHANGES
Simple merge
diff --cc channels/chan_pjsip.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Tue, 13 Jun 2017 14:26:02 +0000 (09:26 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Tue, 13 Jun 2017 14:26:02 +0000 (09:26 -0500)
		1	2
CHANGES	patch \|	diff1 \|	diff2 \|	blob \| history
channels/chan_pjsip.c	patch \|	diff1 \|	diff2 \|	blob \| history