From 37b9e07212a2aa367ed7f13ff840f207e1d2d0dd Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Sun, 1 Jun 1997 21:46:51 +0000
Subject: [PATCH] x

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1825 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f316a55dd..1dd215b7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun  1 23:45:33 1997  Johan Danielsson  <joda@blubb.pdc.kth.se>
+
+	* admin/extkeytab.c: Merged with kdb_edit.
+
 Sun Jun  1 23:23:08 1997  Assar Westerlund  <assar@sics.se>
 
 	* kdc/kdc.c: more support for ENC-TS-ENC