1 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 263951305..1d00c68cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2011101
+20111018
+ - (djm) OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2011/10/04 14:17:32
+     [sftp-glob.c]
+     silence error spam for "ls */foo" in directory with files; bz#1683
+
+20111001
  - (dtucker) [openbsd-compat/mktemp.c] Fix compiler warning.  ok djm
  - (dtucker) OpenBSD CVS Sync
    - dtucker@cvs.openbsd.org 2011/09/23 00:22:04