Blocked revisions 148990 via svnmerge

........
  r148990 | lmadsen | 2008-10-14 15:05:12 -0400 (Tue, 14 Oct 2008) | 4 lines
  
  Add in some missing updates to the CHANGES file for sip.conf
  (closes issue #13100)
  Reported and patch by: gknispel_proformatique
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@148991 65c4cc65-6c06-0410-ace0-fbb531ad65f3