From: Joshua Colp <jcolp@digium.com>
Date: Fri, 13 May 2016 09:54:06 +0000 (-0500)
Subject: Merge "basic-cfg: asterisk.conf: don't set languages" into 13
X-Git-Tag: 13.10.0-rc1~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd9900849bc3442d912a027c0f5c52e3d25cb819;p=thirdparty%2Fasterisk.git

Merge "basic-cfg: asterisk.conf: don't set languages" into 13
---

dd9900849bc3442d912a027c0f5c52e3d25cb819
diff --cc configs/basic-pbx/asterisk.conf
index d0812656f3,2490b56293..ff66ceea7a
--- a/configs/basic-pbx/asterisk.conf
+++ b/configs/basic-pbx/asterisk.conf
@@@ -7,8 -19,7 +7,7 @@@
  
  ; User and group to run asterisk as. NOTE: This will require changes to
  ; directory and device permissions.
 -;runuser = asterisk		; The user to run as.
 -;rungroup = asterisk		; The group to run as.
 +;runuser = asterisk		; The user to run as. The default is root.
 +;rungroup = asterisk		; The group to run as. The default is root
  
- defaultlanguage = en
- documentation_language = en_US
+ ;defaultlanguage = es