commit 5eb137c6d11be7db14dc03ea12a74884bebea3e3
author Damien Miller <djm@mindrot.org> Sat Dec 31 16:19:53 2005 +1100
committer Damien Miller <djm@mindrot.org> Sat Dec 31 16:19:53 2005 +1100
tree f467cd1a617e9357b44783bffdf838b8ef2eb84e
parent 8db70e2398ff1830e18533a75c6e8e5fa98a78e2

 - (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@

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index f86d409..451f1b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 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
 
 20051224
@@ -3552,4 +3558,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4052 2005/12/28 22:28:08 tim Exp $
+$Id: ChangeLog,v 1.4053 2005/12/31 05:19:53 djm Exp $