[asterisk-commits] tilghman: branch 1.8 r280878 - /branches/1.8/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Aug  3 17:18:49 2010
New Revision: 280878

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=280878
Log:
Blocked revisions 280812 via svnmerge

................
  r280812 | tilghman | 2010-08-03 15:52:20 -0500 (Tue, 03 Aug 2010) | 16 lines
  
  Merged revisions 280811 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r280811 | tilghman | 2010-08-03 15:49:10 -0500 (Tue, 03 Aug 2010) | 9 lines
    
    Prevent DAHDI channels from overriding the callerid, once it's been set by the user.
    
    (closes issue #16661)
     Reported by: jstapleton
     Patches: 
           20100414__issue16661.diff.txt uploaded by tilghman (license 14)
           20100415__issue16661__1.6.2.diff.txt uploaded by tilghman (license 14)
     Tested by: jstapleton
  ........
................

Modified:
    branches/1.8/   (props changed)

Propchange: branches/1.8/
------------------------------------------------------------------------------
--- branch-1.6.2-blocked (original)
+++ branch-1.6.2-blocked Tue Aug  3 17:18:49 2010
@@ -1,1 +1,1 @@
-/branches/1.6.2:279852,279883,280227,280556
+/branches/1.6.2:279852,279883,280227,280556,280812