Author: erickson Date: 2007-07-13 14:56:58 -0400 (Fri, 13 Jul 2007) New Revision: 1033 Modified: branches/new-json2/ Log: repairing svnmerge prop Property changes on: branches/new-json2 ___________________________________________________________________ Name: svnmerge-integrated + /trunk:1-1002