Merge branch 'maint-1.9' into maint

diff --git a/test-chmtime.c b/test-chmtime.c
index 0df748784bb7f6b6f286dd37ada293df17cffeee..dfe8a83261b3623e64f99ddf8dc775616771ec4d 100644 (file)
--- a/test-chmtime.c
+++ b/test-chmtime.c
@@ -1,6 +1,6 @@
 /*
  * This program can either change modification time of the given
- * file(s) or just print it. The program does not change atime nor
+ * file(s) or just print it. The program does not change atime or
  * ctime (their values are explicitly preserved).
  *
  * The mtime can be changed to an absolute value: