Merge "basic-cfg: asterisk.conf: defaults of options"
authorJoshua Colp <jcolp@digium.com>
Fri, 13 May 2016 09:53:13 +0000 (04:53 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 13 May 2016 09:53:13 +0000 (04:53 -0500)

Trivial merge