jan 2008-05-24 13:54:34 EDT Modified files: devtools horde-merge.php Log: tweak Revision Changes Path 1.7 +2 -2 framework/devtools/horde-merge.php Chora Links: http://cvs.horde.org/diff.php/framework/devtools/horde-merge.php?r1=1.6&r2=1.7&ty=u