automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@13924 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/sounds.txt b/sounds.txt
index b5fb7af0747ac6e756bb122fafe1bb53b0e77d04..8a4c89c26124bccac701e047b3afc3af123d679f 100644 (file)
--- a/sounds.txt
+++ b/sounds.txt
@@ -641,7 +641,7 @@
 
 %v_p.gsm%victor
 
-%w_p.gsm%wiskey
+%w_p.gsm%whiskey
 
 %x_p.gsm%xray