Merge branch 'maint'

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

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 27b5970bcadf21f2f0e294c8c34d9595f6288503..5214050a882650db098f152c5cc032fdcc823232 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -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 ) .