Merge "core: Remove additional symbols."

author Joshua Colp <jcolp@digium.com>

Tue, 20 Mar 2018 16:44:06 +0000 (11:44 -0500)

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

Tue, 20 Mar 2018 16:44:06 +0000 (11:44 -0500)
author Joshua Colp <jcolp@digium.com>
Tue, 20 Mar 2018 16:44:06 +0000 (11:44 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 20 Mar 2018 16:44:06 +0000 (11:44 -0500)
diff --cc include/asterisk/options.h
Simple merge
diff --cc main/channel.c
Simple merge
diff --cc main/config.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Tue, 20 Mar 2018 16:44:06 +0000 (11:44 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Tue, 20 Mar 2018 16:44:06 +0000 (11:44 -0500)
		1	2
include/asterisk/options.h	patch \|	diff1 \|	diff2 \|	blob \| history
main/channel.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/config.c	patch \|	diff1 \|	diff2 \|	blob \| history