update

diff --git a/ChangeLog b/ChangeLog
index 0c6d54ee5860567dbab8247f64e548478f4f57cb..59f8750ab68d13b6c08ab8f755e0070b775e0136 100644 (file)
--- 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):