Reverted the last two revisions (r23676 and r23677) as these killed the svnmerge properties.
The command used was: svn merge -r23677:r23675 .
Authored by: bugman 2014-06-06
Parent: [r23677]
Child: [r23679]