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

[asterisk-commits at lists.digium.com]

Author: murf
Date: Thu Jan 19 15:40:49 2006
New Revision: 8296

URL: http://svn.digium.com/view/asterisk?rev=8296&view=rev
Log:
Fixed and committed the conflicts from automerge. Away we go! 


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

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