Author: russell Date: Wed Mar 19 13:57:16 2008 New Revision: 110023 URL: http://svn.digium.com/view/asterisk?view=rev&rev=110023 Log: remove svnmerge-blocked property that is not supposed to be here Modified: trunk/ (props changed) Propchange: trunk/ ('svnmerge-blocked' removed)