update

diff --git a/ChangeLog b/ChangeLog
index d8da7d85222c9eb3f6f7c92ea7d4eca44c6f294c..f9f45b259cb4c15eccf8800e16ac27802eda893f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 Changes to squid-1.novm.4 (January XX, 1996):
 
        - Fixed storeRegister loop in icpHandleIMSReply().
+       - Merged squid-1.1.4 changes.
 
 Changes to squid-1.1.4 (January 13, 1997):