Merge branch 'wk/gitweb-snapshot-use-if-modified-since'

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index ede804af3dfe10f660a5cbc6b9652bcbf0c408a8..4171de86e370518e9ec5bf10fcb919ec42019ba2 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3886,6 +3886,7 @@ sub print_feed_meta {
                                '-type' => "application/$type+xml"
                        );
 
+                       $href_params{'extra_options'} = undef;
                        $href_params{'action'} = $type;
                        $link_attr{'-href'} = href(%href_params);
                        print "<link ".