Merge "Replace direct checks of option_debug with DEBUG_ATLEAST macro." into 13

author Joshua Colp <jcolp@digium.com>

Mon, 12 Mar 2018 13:35:51 +0000 (08:35 -0500)

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

Mon, 12 Mar 2018 13:35:51 +0000 (08:35 -0500)
author Joshua Colp <jcolp@digium.com>
Mon, 12 Mar 2018 13:35:51 +0000 (08:35 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 12 Mar 2018 13:35:51 +0000 (08:35 -0500)
diff --cc apps/app_voicemail.c
Simple merge
diff --cc channels/chan_sip.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Mon, 12 Mar 2018 13:35:51 +0000 (08:35 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Mon, 12 Mar 2018 13:35:51 +0000 (08:35 -0500)
		1	2
apps/app_voicemail.c	patch \|	diff1 \|	diff2 \|	blob \| history
channels/chan_sip.c	patch \|	diff1 \|	diff2 \|	blob \| history