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

[SVN commits to the Asterisk project]

Author: may
Date: Mon Feb  7 18:00:44 2011
New Revision: 306758

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

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

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

Propchange: team/may/ooh323_ipv6/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Feb  7 18:00:44 2011
@@ -1,1 +1,1 @@
-/team/may/ooh323_ipv6:1-306756
+/team/may/ooh323_ipv6:1-306756 /trunk:1-290060