Merge changes from topic 'faster-aco'
authorJoshua Colp <jcolp@digium.com>
Mon, 18 Dec 2017 20:41:41 +0000 (14:41 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 18 Dec 2017 20:41:41 +0000 (14:41 -0600)
* changes:
  aco: Minimize use of regex.
  aco: Create ways to minimize use of regex.

1  2 
main/cdr.c
res/res_hep.c

diff --cc main/cdr.c
Simple merge
diff --cc res/res_hep.c
Simple merge