1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 76a5dd086..2e1780a50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011101
  - (dtucker) [openbsd-compat/mktemp.c] Fix compiler warning.  ok djm
+ - (dtucker) OpenBSD CVS Sync
+   - dtucker@cvs.openbsd.org 2011/09/23 00:22:04
+     [channels.c auth-options.c servconf.c channels.h sshd.8]
+     Add wildcard support to PermitOpen, allowing things like "PermitOpen
+     localhost:*".  bz #1857, ok djm markus.
 
 20110929
  - (djm) [configure.ac defines.h] No need to detect sizeof(char); patch