[asterisk-commits] trunk r16521 - /trunk/

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Thu Mar 30 08:19:25 2006
New Revision: 16521

URL: http://svn.digium.com/view/asterisk?rev=16521&view=rev
Log:
be more careful when merging in a branch with automerge properties :-(

Modified:
    trunk/   (props changed)

Propchange: trunk/
            ('automerge' removed)

Propchange: trunk/
            ('automerge-email' removed)

Propchange: trunk/
            ('svnmerge-integrated' removed)