From: wessels <>
Date: Wed, 15 Jan 1997 05:32:07 +0000 (+0000)
Subject: update
X-Git-Tag: SQUID_3_0_PRE1~5205
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f5ec3ed0e062d41192bea750b36d6680cdd59c7;p=thirdparty%2Fsquid.git

update
---

diff --git a/ChangeLog b/ChangeLog
index d8da7d8522..f9f45b259c 100644
--- 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):