[asterisk-commits] rmudgett: branch rmudgett/bridge_phase r399139 - /team/rmudgett/bridge_phase/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Sep 13 17:39:14 2013
New Revision: 399139

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=399139
Log:
Get the jump on automerge before it conflicts.

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

Propchange: team/rmudgett/bridge_phase/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Fri Sep 13 17:39:14 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399100
+/branches/12:1-398558,398560-398577,398579-399100,399136

Propchange: team/rmudgett/bridge_phase/
------------------------------------------------------------------------------
--- bridge_phase-integrated (original)
+++ bridge_phase-integrated Fri Sep 13 17:39:14 2013
@@ -1,1 +1,1 @@
-/trunk:1-399132
+/trunk:1-399138