[svn-commits] may: branch may/ooh323_ipv6 r306970 - /team/may/ooh323_ipv6/

[SVN commits to the Digium repositories]

Author: may
Date: Tue Feb  8 13:50:14 2011
New Revision: 306970

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=306970
Log:
reinit automerge

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.

Propchange: team/may/ooh323_ipv6/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb  8 13:50:14 2011
@@ -1,1 +1,1 @@
-/team/may/ooh323_ipv6:1-306756 /trunk:1-290060
+/trunk:1-290060