Merge branch 'jn/web' into next

diff --git a/gitweb/gitweb.cgi b/gitweb/gitweb.cgi
index d7da6368ce15c5461bd75498cae5db34fec5d0dc..78e6dd03462c8836743f3879c1d1832d5e9931e9 100755 (executable)
--- a/gitweb/gitweb.cgi
+++ b/gitweb/gitweb.cgi
@@ -1518,7 +1518,7 @@ sub mimetype_guess {
 
        if ($mimetypes_file) {
                my $file = $mimetypes_file;
-               $file =~ m#^/# or $file = "$projectroot/$path/$file";
+               #$file =~ m#^/# or $file = "$projectroot/$path/$file";
                $mime = mimetype_guess_file($filename, $file);
        }
        $mime ||= mimetype_guess_file($filename, '/etc/mime.types');