[asterisk-commits] irroot: branch irroot/distrotech-customers-10 r334421 - /team/irroot/distrote...

[SVN commits to the Asterisk project]

Author: irroot
Date: Sat Sep  3 08:44:47 2011
New Revision: 334421

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

Modified:
    team/irroot/distrotech-customers-10/   (props changed)

Propchange: team/irroot/distrotech-customers-10/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/irroot/distrotech-customers-10/
            ('svnmerge-integrated' removed)