Merge "aco: Minimize use of regex." into 13

author Jenkins2 <jenkins2@gerrit.asterisk.org>

Mon, 18 Dec 2017 19:32:31 +0000 (13:32 -0600)

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

Mon, 18 Dec 2017 19:32:31 +0000 (13:32 -0600)
author Jenkins2 <jenkins2@gerrit.asterisk.org>
Mon, 18 Dec 2017 19:32:31 +0000 (13:32 -0600)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 18 Dec 2017 19:32:31 +0000 (13:32 -0600)
diff --cc main/cdr.c
Simple merge
diff --cc res/res_hep.c
Simple merge
author	Jenkins2 <jenkins2@gerrit.asterisk.org>
	Mon, 18 Dec 2017 19:32:31 +0000 (13:32 -0600)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Mon, 18 Dec 2017 19:32:31 +0000 (13:32 -0600)
		1	2
main/cdr.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_hep.c	patch \|	diff1 \|	diff2 \|	blob \| history