[asterisk-commits] rmudgett: branch rmudgett/call_waiting r267260 - /team/rmudgett/call_waiting/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Jun  2 15:43:41 2010
New Revision: 267260

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

Modified:
    team/rmudgett/call_waiting/   (props changed)

Propchange: team/rmudgett/call_waiting/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/rmudgett/call_waiting/
------------------------------------------------------------------------------
--- call_waiting-integrated (original)
+++ call_waiting-integrated Wed Jun  2 15:43:41 2010
@@ -1,1 +1,1 @@
-/team/group/CCSS:1-267137
+/team/group/CCSS:1-267259

Propchange: team/rmudgett/call_waiting/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun  2 15:43:41 2010
@@ -1,1 +1,1 @@
-/trunk:1-267099
+/trunk:1-267187