From: wessels <>
Date: Tue, 4 Feb 1997 14:22:24 +0000 (+0000)
Subject: update
X-Git-Tag: SQUID_3_0_PRE1~5144
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cab88bee5d73f4ca8dacd5766cb0bb6057c11d4a;p=thirdparty%2Fsquid.git

update
---

diff --git a/ChangeLog b/ChangeLog
index 0c6d54ee58..59f8750ab6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ Changes to squid-1.novm.5 (February XX, 1996):
 
 	- Fixed stuck objects (and FD leak) due to not unlocking
 	  objects in storeAbort().
+	- Merged squid-1.1.5 changes.
 
 Changes to squid-1.1.5 (January 22, 1996):