- (djm) OpenBSD CVS Sync

[openssh.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index c37c6af5083306f63e9410c3a7f517f6d99a0666..375bdf9c8ca875d712a5b9f1a93d1d274fcf59cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20051229
+ - (djm) OpenBSD CVS Sync
+   - stevesk@cvs.openbsd.org 2005/12/28 22:46:06
+     [canohost.c channels.c clientloop.c]
+     use 'break-in' for consistency; ok deraadt@ ok and input jmc@
+
 20051229
  - (tim) [buildpkg.sh.in] grep for $SSHDUID instead of $SSHDGID on /etc/passwd