Author: murf Date: Tue Nov 7 15:49:50 2006 New Revision: 47291 URL: http://svn.digium.com/view/asterisk?rev=47291&view=rev Log: Turning off automerge Modified: team/murf/bug_7506_1.4/ (props changed) Propchange: team/murf/bug_7506_1.4/ ('automerge' removed)