From: Automerge script Date: Thu, 1 Jun 2006 13:05:15 +0000 (+0000) Subject: automerge commit X-Git-Tag: 1.2.9.1-netsec~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b24a2336480990b4674511f8bc0d1bd1f08ff54;p=thirdparty%2Fasterisk.git automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@31352 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index ecaef3c89b..9e2d633281 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -362,7 +362,6 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ;allow=alaw ;allow=g723.1 ; Asterisk only supports g723.1 pass-thru! ;allow=g729 ; Pass-thru only unless g729 license obtained -;astdb=chan2ext/SIP/grandstream1=1234 ; ensures an astDB entry exists ;[xlite1]