Author: oej Date: Thu Jan 26 08:15:04 2006 New Revision: 8708 URL: http://svn.digium.com/view/asterisk?rev=8708&view=rev Log: Initialize merging Modified: team/oej/jitterbuffer/ (props changed) Propchange: team/oej/jitterbuffer/ ('svnmerge-integrated' removed)