Merge "Allow command-line options to override asterisk.conf."
authorJoshua Colp <jcolp@digium.com>
Tue, 12 May 2015 16:59:04 +0000 (11:59 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 12 May 2015 16:59:04 +0000 (11:59 -0500)
commit3858e67dd549cf600fe1ed0c814affd9fb64c708
treebc8e6f4ece2dc1be595e62471a99574ff1a0feaa
parent29513333e1ca97b18ab900ad851292228049df02
parent57386dcb67a54b14cf395802669cf432a777e94b
Merge "Allow command-line options to override asterisk.conf."