X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/8bb69cbe1d21b7f62ea66fbe054fb098643d4ac8..4c38dc091ae8448e3b8c580fac09ae2015941096:/openssh/CVSNOTES

diff --git a/openssh/CVSNOTES b/openssh/CVSNOTES
index a7f30df..8182089 100644
--- a/openssh/CVSNOTES
+++ b/openssh/CVSNOTES
@@ -50,6 +50,14 @@ contains the GSI-OpenSSH code.  Consider it a living document.
 
   [ History ]
 
+    2003/05/05
+    ----------
+      Action: Merge
+        - occurred on: GPT branch
+        - orig base: OPENSSH_3_6_1P1_GSSAPI_20030425
+        - new base: OPENSSH_3_6_1P2_GSSAPI_20030505
+      Conflicts: 0
+
     2003/05/05
     ----------
       Action: Merge