From: wessels <>
Date: Mon, 28 Apr 1997 11:12:46 +0000 (+0000)
Subject: update
X-Git-Tag: SQUID_3_0_PRE1~5044
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74cebec00a21052d0c61783bdda1e3633b13cd7a;p=thirdparty%2Fsquid.git

update
---

diff --git a/ChangeLog b/ChangeLog
index 347a89d607..cd5313a7f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Changes to squid-1.2.alpha1 ():
+
+	- Merged squid-1.1.9, squid-1.1.10 changes
+
 Changes to squid-1.2.alpha1 ():
 
 	- Unified peer selection algorithm.