[asterisk-commits] oej: branch group/bufo-manager-setvar-trunk r336657 - /team/group/bufo-manage...

[SVN commits to the Asterisk project]

Author: oej
Date: Mon Sep 19 12:47:43 2011
New Revision: 336657

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=336657
Log:
Reset automerge. No conflicts to solve, even if a lot was indicated.

Modified:
    team/group/bufo-manager-setvar-trunk/   (props changed)

Propchange: team/group/bufo-manager-setvar-trunk/
------------------------------------------------------------------------------
    automerge = Is-there-life-off-net?

Propchange: team/group/bufo-manager-setvar-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Sep 19 12:47:43 2011
@@ -1,1 +1,1 @@
-/trunk:1-336579
+/trunk:1-336656