Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  dir.c: Fix two minor grammatical errors in comments

diff --cc dir.c
index 2c18e417d16801cbca38ab1e7b8b5f8615f1e45d,4e6b988d37a0fb58fde4a170ebf7fe3702a3a474..53ad921a0b93a70c7614dcdab25c6ef3e9a0c8b6
--- 1/dir.c
--- 2/dir.c
+++ b/dir.c
@@@ -52,8 -52,13 +52,8 @@@ int common_prefix(const char **pathspec
        return prefix;
  }
  
 -static inline int special_char(unsigned char c1)
 -{
 -      return !c1 || c1 == '*' || c1 == '[' || c1 == '?' || c1 == '\\';
 -}
 -
  /*
-  * Does 'match' matches the given name?
+  * Does 'match' match the given name?
   * A match is found if
   *
   * (1) the 'match' string is leading directory of 'name', or