[svn-commits] qwell: trunk r48187 - in /trunk: ./ configs/extensions.conf.sample

[svn-commits at lists.digium.com]

Author: qwell
Date: Fri Dec  1 14:26:44 2006
New Revision: 48187

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48187
Log:
Merged revisions 48186 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r48186 | qwell | 2006-12-01 14:25:51 -0600 (Fri, 01 Dec 2006) | 10 lines

Merged revisions 48183 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r48183 | qwell | 2006-12-01 14:19:10 -0600 (Fri, 01 Dec 2006) | 2 lines

Fix a small typo - issue 8848, reported by pabelanger

........

................

Modified:
    trunk/   (props changed)
    trunk/configs/extensions.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/configs/extensions.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/extensions.conf.sample?view=diff&rev=48187&r1=48186&r2=48187
==============================================================================
--- trunk/configs/extensions.conf.sample (original)
+++ trunk/configs/extensions.conf.sample Fri Dec  1 14:26:44 2006
@@ -167,7 +167,7 @@
 ;
 ; List canonical entries here
 ;
-;exten => 12564286000,1,Macro(std-exten,6000,IAX2/foo)
+;exten => 12564286000,1,Macro(stdexten,6000,IAX2/foo)
 ;exten => _125642860XX,1,Dial(IAX2/otherbox/${EXTEN:7})
 
 [dundi-e164-customers]