[svn-commits] rmudgett: branch rmudgett/bridge_phase r390754 - /team/rmudgett/bridge_phase/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Thu Jun  6 16:51:52 2013
New Revision: 390754

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=390754
Log:
Turn off automerge to prevent conflict while I am resolving it.

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

Propchange: team/rmudgett/bridge_phase/
            ('automerge' removed)