* (bug 6139) Workaround for transclusion oddities in Vietnamese upload text
* (bug 6136) Update to Catalan language (ca)
* Update to Japanese localization (ja)
+* Add /usr/local/bin to the diff3 search paths in the installer
== Compatibility ==
}
$conf->diff3 = false;
-$diff3locations = array("/usr/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin") + explode($sep, getenv("PATH"));
+$diff3locations = array("/usr/bin", "/usr/local/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin") + explode($sep, getenv("PATH"));
$diff3names = array("gdiff3", "diff3", "diff3.exe");
$diff3versioninfo = array('$1 --version 2>&1', 'diff3 (GNU diffutils)');