From ff649d888076a94033ebce016c85c5419a2c290b Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Mon, 16 Oct 2000 13:35:19 +1100
Subject:  - (djm) Merge some of Nalin Dahyabhai <nalin@redhat.com> changes
 from the    Redhat 7.0 spec file

---
 ChangeLog | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index b24704836..ed4a40a87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,9 +28,11 @@
      typo
  - (djm) Copy manpages back over from OpenBSD - too tedious to wade 
    through diffs
- - Added condrestart to Redhat init script. Patch from Pekka Savola 
+ - (djm) Added condrestart to Redhat init script. Patch from Pekka Savola 
    <pekkas@netcore.fi>
- - Update version in Redhat spec file
+ - (djm) Update version in Redhat spec file
+ - (djm) Merge some of Nalin Dahyabhai <nalin@redhat.com> changes from the 
+   Redhat 7.0 spec file
 
 20001015
  - (djm) Fix ssh2 hang on background processes at logout.
-- 
cgit v1.2.3