From 0f8bb3e380033d32d794b7a3e3cba8dc519cd9eb Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Sun, 1 Jun 1997 21:34:30 +0000
Subject: [PATCH] x

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

diff --git a/ChangeLog b/ChangeLog
index 2e05db541..f316a55dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@ Sun Jun  1 23:23:08 1997  Assar Westerlund  <assar@sics.se>
 
 Sun Jun  1 22:45:11 1997  Johan Danielsson  <joda@blubb.pdc.kth.se>
 
+	* lib/hdb/db.c: Merge fetch and store.
+
+	* admin: Merge to one program.
+
 	* lib/krb5/str2key.c: Fill in keytype and length.
 
 Sun Jun  1 16:31:23 1997  Assar Westerlund  <assar@sics.se>