automerge commit

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

diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample
index d773cbbc3eb04a875845f9e732636875f82b1f3c..7d46f08ab9a1d8a49b260e2623d4d47ae6de391a 100644 (file)
--- a/configs/extensions.conf.sample
+++ b/configs/extensions.conf.sample
@@ -40,7 +40,7 @@ autofallthrough=yes
 ;
 ; If clearglobalvars is not set, then global variables will persist
 ; through reloads, and even if deleted from the extensions.conf or
-; one if its included files, will remain set to the previous value.
+; one of its included files, will remain set to the previous value.
 ;
 clearglobalvars=no
 ;