Merge "bridge_softmix: Forward TEXT frames" into 13

author George Joseph <gjoseph@digium.com>

Fri, 27 Apr 2018 18:17:27 +0000 (13:17 -0500)

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

Fri, 27 Apr 2018 18:17:27 +0000 (13:17 -0500)
author George Joseph <gjoseph@digium.com>
Fri, 27 Apr 2018 18:17:27 +0000 (13:17 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 27 Apr 2018 18:17:27 +0000 (13:17 -0500)
diff --cc CHANGES
Simple merge
diff --cc channels/chan_pjsip.c
Simple merge
author	George Joseph <gjoseph@digium.com>
	Fri, 27 Apr 2018 18:17:27 +0000 (13:17 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Fri, 27 Apr 2018 18:17:27 +0000 (13:17 -0500)
		1	2
CHANGES	patch \|	diff1 \|	diff2 \|	blob \| history
channels/chan_pjsip.c	patch \|	diff1 \|	diff2 \|	blob \| history