Merged revisions 302005 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Mon, 17 Jan 2011 15:06:10 +0000 (15:06 +0000)
committerTerry Wilson <twilson@digium.com>
Mon, 17 Jan 2011 15:06:10 +0000 (15:06 +0000)
commit29cb03ebf2cb8671d064730f26cdb6e1d9959eaa
tree46ea3ddaad75fe946df62688abe5ae461a1026c3
parentc69406f384f41f849af0f1d4fcae3c4458fcdffb
Merged revisions 302005 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r302005 | twilson | 2011-01-17 09:04:59 -0600 (Mon, 17 Jan 2011) | 2 lines

  Document "encryption" option in sip.conf.sample
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302006 65c4cc65-6c06-0410-ace0-fbb531ad65f3
configs/sip.conf.sample