Author: crichter Date: Tue Dec 6 03:07:09 2005 New Revision: 7359 URL: http://svn.digium.com/view/asterisk?rev=7359&view=rev Log: deleted merger props Modified: team/crichter/0.3.0/ (props changed) Propchange: team/crichter/0.3.0/ ('svnmerge-integrated' removed)