[svn-commits] moy: trunk r299532 - /trunk/

[SVN commits to the Digium repositories]

Author: moy
Date: Wed Dec 22 20:55:28 2010
New Revision: 299532

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

................
  r299531 | moy | 2010-12-22 21:53:02 -0500 (Wed, 22 Dec 2010) | 13 lines
  
  Merged revisions 299530 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r299530 | moy | 2010-12-22 21:28:37 -0500 (Wed, 22 Dec 2010) | 7 lines
    
    Enqueue AST_CONTROL_PROGRESS after AST_CONTROL_RINGING when MFC-R2 calls are accepted
    
    (closes issue #18438)
    Reported by: mariner7
    Tested by: moy
  ........
................

Modified:
    trunk/   (props changed)

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.8-blocked (original)
+++ branch-1.8-blocked Wed Dec 22 20:55:28 2010
@@ -1,1 +1,1 @@
-/branches/1.8:
+/branches/1.8:299531