OPENSSH_4_5P1_20070218 merged to GPT branch

[gssapi-openssh.git] / openssh / CVSNOTES

diff --git a/openssh/CVSNOTES b/openssh/CVSNOTES
index d85a9b7d088f0deb7f382244c0dcc09c9fa59edd..e6b7492f7cf7ad28a9f0f333c6dfa6a34ff7e134 100644 (file)
--- a/openssh/CVSNOTES
+++ b/openssh/CVSNOTES
@@ -59,6 +59,14 @@ module that contains the GSI-OpenSSH code.  Consider it a living document.
 
   [ History ]
 
+    2007/02/18
+    ----------
+      Action: Merge
+        - occurred on: GPT branch
+        - orig base: OPENSSH_4_5P1_20070215
+        - new base: OPENSSH_4_5P1_20070218
+      Conflicts: None.
+
     2007/02/15
     ----------
       Action: Merge