Merge branch 'maint'

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index d02b7a3c268045ac0a15855d0f0c06c28b7a88be..ff2d42abb95252736879b1b59696b31922415c44 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -415,7 +415,7 @@ sub gitweb_get_feature {
                @{$feature{$name}{'default'}});
        if (!$override) { return @defaults; }
        if (!defined $sub) {
-               warn "feature $name is not overrideable";
+               warn "feature $name is not overridable";
                return @defaults;
        }
        return $sub->(@defaults);