automerge commit

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

diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index 3fb5d338a78f9bc95ee9c0849d2d3bfb09250e0c..26d637d8db1889a78c729e76e62e80f32f20459b 100644 (file)
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -333,6 +333,11 @@ inkeys=freeworlddialup
 ; keys should always be 3DES encrypted.
 ;
 ;
+; NOTE: All hostnames and IP addresses in this file are for example purposes
+;       only; you should not expect any of them to actually be available for
+;       your use.
+;
+;
 ;[markster]
 ;type=user
 ;context=default