From c0be6bc68f3d04069d4559c211aa3e38b75f9b2b Mon Sep 17 00:00:00 2001
From: Leif Madsen <leif@leifmadsen.com>
Date: Tue, 14 Oct 2008 19:26:27 +0000
Subject: [PATCH] Blocked revisions 148991 via svnmerge

................
  r148991 | lmadsen | 2008-10-14 15:21:54 -0400 (Tue, 14 Oct 2008) | 10 lines

  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/branches/1.6.1@148997 65c4cc65-6c06-0410-ace0-fbb531ad65f3