Merge "Implement internal abstraction for iostreams"

author Joshua Colp <jcolp@digium.com>

Thu, 17 Nov 2016 17:07:06 +0000 (11:07 -0600)

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

Thu, 17 Nov 2016 17:07:06 +0000 (11:07 -0600)
author Joshua Colp <jcolp@digium.com>
Thu, 17 Nov 2016 17:07:06 +0000 (11:07 -0600)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 17 Nov 2016 17:07:06 +0000 (11:07 -0600)
diff --cc channels/chan_sip.c
Simple merge
diff --cc configure.ac
Simple merge
diff --cc res/res_http_websocket.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Thu, 17 Nov 2016 17:07:06 +0000 (11:07 -0600)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Thu, 17 Nov 2016 17:07:06 +0000 (11:07 -0600)
		1	2
channels/chan_sip.c	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_http_websocket.c	patch \|	diff1 \|	diff2 \|	blob \| history