K 10
svn:author
V 6
rpaulo
K 8
svn:date
V 27
2008-08-27T22:55:00.479515Z
K 7
svn:log
V 61
Revert r182297. detect-merge-conflict.sh is now deactivated.

END