update

diff --git a/ChangeLog b/ChangeLog
index 347a89d607f360afbf15d6e8bd79534cd446dcdc..cd5313a7f499f59981b37412ebc3c10a5037f3fd 100644 (file)
--- 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.