Merge "ARI: Add method to Dial a created channel."

author Joshua Colp <jcolp@digium.com>

Wed, 6 Apr 2016 10:43:47 +0000 (05:43 -0500)

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

Wed, 6 Apr 2016 10:43:47 +0000 (05:43 -0500)
author Joshua Colp <jcolp@digium.com>
Wed, 6 Apr 2016 10:43:47 +0000 (05:43 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 6 Apr 2016 10:43:47 +0000 (05:43 -0500)
diff --cc include/asterisk/stasis_app.h
Simple merge
diff --cc res/res_stasis.c
Simple merge
diff --cc res/stasis/control.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Wed, 6 Apr 2016 10:43:47 +0000 (05:43 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Wed, 6 Apr 2016 10:43:47 +0000 (05:43 -0500)
		1	2
include/asterisk/stasis_app.h	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_stasis.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/stasis/control.c	patch \|	diff1 \|	diff2 \|	blob \| history