From: Joshua Colp <jcolp@digium.com>
Date: Tue, 12 May 2015 16:59:04 +0000 (-0500)
Subject: Merge "Allow command-line options to override asterisk.conf."
X-Git-Tag: 14.0.0-beta1~961
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3858e67dd549cf600fe1ed0c814affd9fb64c708;p=thirdparty%2Fasterisk.git

Merge "Allow command-line options to override asterisk.conf."
---

3858e67dd549cf600fe1ed0c814affd9fb64c708