[asterisk-commits] file: branch file/bridging-phase2 r180450 - /team/file/bridging-phase2/

[SVN commits to the Asterisk project]

Author: file
Date: Thu Mar  5 13:33:03 2009
New Revision: 180450

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=180450
Log:
Setup merging.

Modified:
    team/file/bridging-phase2/   (props changed)

Propchange: team/file/bridging-phase2/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/file/bridging-phase2/
------------------------------------------------------------------------------
    automerge-email = jcolp at digium.com

Propchange: team/file/bridging-phase2/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-180444