Merge branch 'maint'

* maint:
gitweb: Fix "next" link in commit view

diff --combined gitweb/gitweb.perl
index 27b5970bcadf21f2f0e294c8c34d9595f6288503,ea39d7e98bb646897d1bb1f1e270b1cd2fc046ad..5214050a882650db098f152c5cc032fdcc823232
--- 1/gitweb/gitweb.perl
--- 2/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@@ -591,7 -591,7 +591,7 @@@ sub esc_html ($;%) 
        my %opts = @_;
  
        $str = to_utf8($str);
 -      $str = escapeHTML($str);
 +      $str = $cgi->escapeHTML($str);
        if ($opts{'-nbsp'}) {
                $str =~ s/ / /g;
        }
@@@ -605,7 -605,7 +605,7 @@@ sub esc_path 
        my %opts = @_;
  
        $str = to_utf8($str);
 -      $str = escapeHTML($str);
 +      $str = $cgi->escapeHTML($str);
        if ($opts{'-nbsp'}) {
                $str =~ s/ / /g;
        }
@@@ -1974,17 -1974,17 +1974,17 @@@ sub git_print_page_path 
                        $fullname .= ($fullname ? '/' : '') . $dir;
                        print $cgi->a({-href => href(action=>"tree", file_name=>$fullname,
                                                     hash_base=>$hb),
 -                                    -title => esc_html($fullname)}, esc_path($dir));
 +                                    -title => $fullname}, esc_path($dir));
                        print " / ";
                }
                if (defined $type && $type eq 'blob') {
                        print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name,
                                                     hash_base=>$hb),
 -                                    -title => esc_html($name)}, esc_path($basename));
 +                                    -title => $name}, esc_path($basename));
                } elsif (defined $type && $type eq 'tree') {
                        print $cgi->a({-href => href(action=>"tree", file_name=>$file_name,
                                                     hash_base=>$hb),
 -                                    -title => esc_html($name)}, esc_path($basename));
 +                                    -title => $name}, esc_path($basename));
                        print " / ";
                } else {
                        print esc_path($basename);
@@@ -3719,7 -3719,7 +3719,7 @@@ sub git_commit 
                $formats_nav .=
                        '(merge: ' .
                        join(' ', map {
-                               $cgi->a({-href => href(action=>"commitdiff",
+                               $cgi->a({-href => href(action=>"commit",
                                                       hash=>$_)},
                                        esc_html(substr($_, 0, 7)));
                        } @$parents ) .