[asterisk-commits] may: branch may/ooh323_ipv6 r307063 - /team/may/ooh323_ipv6/

[SVN commits to the Asterisk project]

Author: may
Date: Tue Feb  8 15:03:15 2011
New Revision: 307063

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

................
  r306968 | jpeeler | 2011-02-08 22:42:03 +0300 (Tue, 08 Feb 2011) | 23 lines
  
  Merged revisions 306967 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ................
    r306967 | jpeeler | 2011-02-08 13:41:42 -0600 (Tue, 08 Feb 2011) | 16 lines
    
    Merged revisions 306966 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.6.2
    
    ................
      r306966 | jpeeler | 2011-02-08 13:41:21 -0600 (Tue, 08 Feb 2011) | 9 lines
      
      Merged revisions 306965 via svnmerge from 
      https://origsvn.digium.com/svn/asterisk/branches/1.4
      
      ........
        r306965 | jpeeler | 2011-02-08 13:40:58 -0600 (Tue, 08 Feb 2011) | 1 line
        
        fix this line again
      ........
    ................
  ................
................

Modified:
    team/may/ooh323_ipv6/   (props changed)

Propchange: team/may/ooh323_ipv6/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/may/ooh323_ipv6/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.