[asterisk-commits] branch group/sip-threading r26171 - /team/group/sip-threading/

[asterisk-commits at lists.digium.com]

Author: file
Date: Tue May  9 11:24:43 2006
New Revision: 26171

URL: http://svn.digium.com/view/asterisk?rev=26171&view=rev
Log:
Setup merging and automerging

Modified:
    team/group/sip-threading/   (props changed)

Propchange: team/group/sip-threading/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/sip-threading/
------------------------------------------------------------------------------
    automerge-email = jcolp at digium.com

Propchange: team/group/sip-threading/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-26167