[asterisk-commits] file: branch file/p2prtpbridging r40551 - /team/file/p2prtpbridging/

[asterisk-commits at lists.digium.com]

Author: file
Date: Sat Aug 19 17:34:08 2006
New Revision: 40551

URL: http://svn.digium.com/view/asterisk?rev=40551&view=rev
Log:
Merge it baby like you know you can

Modified:
    team/file/p2prtpbridging/   (props changed)

Propchange: team/file/p2prtpbridging/
------------------------------------------------------------------------------
    automerge = moooooooo

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

Propchange: team/file/p2prtpbridging/
            ('branch-1.2-blocked' removed)

Propchange: team/file/p2prtpbridging/
            ('branch-1.2-merged' removed)

Propchange: team/file/p2prtpbridging/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-40549