commit 6029e076b2c58f5a2cb0dce370b1f14912104fcd
author Damien Miller <djm@mindrot.org> Mon Jun 20 14:22:49 2011 +1000
committer Damien Miller <djm@mindrot.org> Mon Jun 20 14:22:49 2011 +1000
tree 929c75199a7ff75e3ec612bbe47ed7e9ae359b44
parent bc481570d14b6061fe4cb286cec56d555351c28d

   - djm@cvs.openbsd.org 2011/06/04 00:10:26
     [ssh_config.5]
     explain IdentifyFile's semantics a little better, prompted by bz#1898
     ok dtucker jmc

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 32a3836..e342891 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20110620
+ - OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2011/06/04 00:10:26
+     [ssh_config.5]
+     explain IdentifyFile's semantics a little better, prompted by bz#1898
+     ok dtucker jmc
+
 20110603
  - (dtucker) [README version.h contrib/caldera/openssh.spec
    contrib/redhat/openssh.spec contrib/suse/openssh.spec] Pull the version