[asterisk-commits] branch murf/AEL2 r13320 - /team/murf/AEL2/

[asterisk-commits at lists.digium.com]

Author: murf
Date: Thu Mar 16 20:31:25 2006
New Revision: 13320

URL: http://svn.digium.com/view/asterisk?rev=13320&view=rev
Log:
Resolved conflicts, and now I'm putting the automerge prop back in.


Modified:
    team/murf/AEL2/   (props changed)

Propchange: team/murf/AEL2/
------------------------------------------------------------------------------
    automerge = 1