Merge branch 'maint'

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 093bd72058cde4d766acd8057cb407e2ed6373cb..ffe8ce13ff3e5a66f3ffc548238bee29f4593f97 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -4282,7 +4282,7 @@ sub git_feed {
                }
                if (defined $logo_url) {
                        # not twice as wide as tall: 72 x 27 pixels
-                       print "<logo>" . esc_url($logo_url) . "</logo>\n";
+                       print "<logo>" . esc_url($logo) . "</logo>\n";
                }
                if (! %latest_date) {
                        # dummy date to keep the feed valid until commits trickle in: