Merge "res_stasis: Reduce RAII_VAR usage." into 15

author Joshua Colp <jcolp@digium.com>

Wed, 10 Jan 2018 12:54:25 +0000 (06:54 -0600)

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

Wed, 10 Jan 2018 12:54:26 +0000 (06:54 -0600)
author Joshua Colp <jcolp@digium.com>
Wed, 10 Jan 2018 12:54:25 +0000 (06:54 -0600)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 10 Jan 2018 12:54:26 +0000 (06:54 -0600)
diff --cc res/res_stasis.c
Simple merge
diff --cc res/stasis/control.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Wed, 10 Jan 2018 12:54:25 +0000 (06:54 -0600)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Wed, 10 Jan 2018 12:54:26 +0000 (06:54 -0600)
		1	2
res/res_stasis.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/stasis/control.c	patch \|	diff1 \|	diff2 \|	blob \| history