- (djm) OpenBSD CVS Sync

[openssh.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index d6ab16a741702bec9c156829e33ed0d6fd5b5baf..0e32f377656ee6326f99def583e65121ab58e4d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
  - (djm) [regress/test-exec.sh] Try 'logname' as well as 'whoami' to 
    determine the user's login name - needed for regress tests on Solaris 
    10 and OpenSolaris
+ - (djm) OpenBSD CVS Sync
+   - jmc@cvs.openbsd.org 2006/02/01 09:06:50
+     [sshd.8]
+     - merge sections on protocols 1 and 2 into a single section
+     - remove configuration file section
+     ok markus
 
 20060131
  - (djm) OpenBSD CVS Sync