[asterisk-commits] file: branch file/rtp_engine-mark2 r183104 - /team/file/rtp_engine-mark2/

[SVN commits to the Asterisk project]

Author: file
Date: Thu Mar 19 08:12:32 2009
New Revision: 183104

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=183104
Log:
Oh dear! Automerge please.

Modified:
    team/file/rtp_engine-mark2/   (props changed)

Propchange: team/file/rtp_engine-mark2/
------------------------------------------------------------------------------
    automerge = *

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

Propchange: team/file/rtp_engine-mark2/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-183095