[asterisk-commits] may: branch may/ooh323_ipv6_direct_rtp r307191 - /team/may/ooh323_ipv6_direct...

[SVN commits to the Asterisk project]

Author: may
Date: Wed Feb  9 08:21:51 2011
New Revision: 307191

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=307191
Log:
Merged revisions 307182-307184 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/team/may/ooh323_ipv6

........
  r307182 | may | 2011-02-09 12:20:43 +0300 (Wed, 09 Feb 2011) | 2 lines
  
  ...
........
  r307183 | root | 2011-02-09 13:17:38 +0300 (Wed, 09 Feb 2011) | 1 line
  
  automerge cancel
........
  r307184 | may | 2011-02-09 13:53:06 +0300 (Wed, 09 Feb 2011) | 2 lines
  
  ...
........

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

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

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Feb  9 08:21:51 2011
@@ -1,1 +1,2 @@
-/team/may/ooh323_ipv6:1-306970,306997,307062-307106
+/team/may/ooh323_ipv6:1-306970,306997,307062-307106,307182-307184
+/trunk:1-306962