[asterisk-commits] kpfleming: branch markster/usersconf r40859 - /team/markster/usersconf/

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Tue Aug 22 17:18:20 2006
New Revision: 40859

URL: http://svn.digium.com/view/asterisk?rev=40859&view=rev
Log:
restore merge setup

Modified:
    team/markster/usersconf/   (props changed)

Propchange: team/markster/usersconf/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-40803