update

diff --git a/ChangeLog b/ChangeLog
index 167e0587efa7b21f278f55e836afb402e53d5851..289201f18a05e1ed9df0e3a39d1c784c7ebfb56e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Changes to squid-1.novm.6 (February 7, 1997):
+
+       - Merged squid-1.1.6 changes.
+
 Changes to squid-1.1.6 (February 7, 1997):
 
        - Fix redirector to make sure the redirector child process is