Merge branch 'maint-1.8.5' into maint-1.9

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 3bc0f0b5ca0995910e0e517b545b5fb9af626a8b..52108b925526764f78be017afc47003036469346 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1490,7 +1490,7 @@ sub is_valid_pathname {
        my $input = shift;
 
        return undef unless defined $input;
-       # no '.' or '..' as elements of path, i.e. no '.' nor '..'
+       # no '.' or '..' as elements of path, i.e. no '.' or '..'
        # at the beginning, at the end, and between slashes.
        # also this catches doubled slashes
        if ($input =~ m!(^|/)(|\.|\.\.)(/|$)!) {