Author: oej Date: Tue Jan 31 09:37:19 2006 New Revision: 8990 URL: http://svn.digium.com/view/asterisk?rev=8990&view=rev Log: Initialize merging Modified: team/oej/strictrouting/ (props changed) Propchange: team/oej/strictrouting/ ('svnmerge-integrated' removed)