Merge "pbx.h: Make ast_state_cb_type take more const."

author Joshua Colp <jcolp@digium.com>

Fri, 8 Apr 2016 20:47:50 +0000 (15:47 -0500)

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

Fri, 8 Apr 2016 20:47:50 +0000 (15:47 -0500)
author Joshua Colp <jcolp@digium.com>
Fri, 8 Apr 2016 20:47:50 +0000 (15:47 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 8 Apr 2016 20:47:50 +0000 (15:47 -0500)
diff --cc include/asterisk/pbx.h
Simple merge
diff --cc main/pbx.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Fri, 8 Apr 2016 20:47:50 +0000 (15:47 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Fri, 8 Apr 2016 20:47:50 +0000 (15:47 -0500)
		1	2
include/asterisk/pbx.h	patch \|	diff1 \|	diff2 \|	blob \| history
main/pbx.c	patch \|	diff1 \|	diff2 \|	blob \| history