From 956c878eb84e39daa0344a4d07f2d4c18f3e6f7d Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Sat, 16 Dec 2000 00:18:00 +0000
Subject: [PATCH] x

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

diff --git a/ChangeLog b/ChangeLog
index 2001c74ba..f358e50c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-12-15  Johan Danielsson  <joda@pdc.kth.se>
 
+	* admin/Makefile.am: merge srvconvert and srvcreate with copy
+
+	* admin/copy.c: merge srvconvert and srvcreate with copy
+
 	* lib/krb5/Makefile.am: always build keytab_krb4.c
 
 	* lib/krb5/context.c: always register the krb4 keytab functions