Author: kpfleming Date: Tue Nov 7 08:25:00 2006 New Revision: 47259 URL: http://svn.digium.com/view/asterisk?rev=47259&view=rev Log: remove another broken property merge Modified: trunk/ (props changed) Propchange: trunk/ ('svnmerge-blocked' removed)