[asterisk-commits] irroot: branch irroot/app_queue_skill r325531 - /team/irroot/app_queue_skill/

[SVN commits to the Asterisk project]

Author: irroot
Date: Wed Jun 29 07:22:25 2011
New Revision: 325531

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=325531
Log:
resolve conflict, enable automerge

Modified:
    team/irroot/app_queue_skill/   (props changed)

Propchange: team/irroot/app_queue_skill/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/irroot/app_queue_skill/
            ('svnmerge-integrated' removed)