Author: file Date: Mon Jan 22 19:51:22 2007 New Revision: 51515 URL: http://svn.digium.com/view/asterisk?view=rev&rev=51515 Log: No more conflicts on properties! svnmerge-block be gone! Modified: trunk/ (props changed) Propchange: trunk/ ('svnmerge-blocked' removed)