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

[asterisk-commits at lists.digium.com]

Author: murf
Date: Sat Apr 22 13:23:46 2006
New Revision: 22157

URL: http://svn.digium.com/view/asterisk?rev=22157&view=rev
Log:
Hmmm... automerge dropped out... app.c had a conflict.
So, I hand merged it back in, and turned the prop back
on.


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

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