Recorded merge of revisions 283124 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r283124 | rmudgett | 2010-08-20 11:48:10 -0500 (Fri, 20 Aug 2010) | 16 lines
  
  Merged revisions 283123 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ................
    r283123 | rmudgett | 2010-08-20 11:46:22 -0500 (Fri, 20 Aug 2010) | 9 lines
    
    Merged revision 278274 from
    https://origsvn.digium.com/svn/asterisk/trunk
    
    ..........
      r278274 | rmudgett | 2010-07-20 17:38:13 -0500 (Tue, 20 Jul 2010) | 1 line
    
      Reference correct struct member for unlikely event PRI_EVENT_CONFIG_ERR.
    ..........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@283125 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2010-08-20 16:51:16 +00:00
parent c453d72423
commit 95632201df

Diff Content Not Available