Author: oej Date: Tue Jan 31 08:25:51 2006 New Revision: 8974 URL: http://svn.digium.com/view/asterisk?rev=8974&view=rev Log: Initializing merging Modified: team/oej/iptos/ (props changed) Propchange: team/oej/iptos/ ('svnmerge-integrated' removed)