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)

Trivial merge