diff --git a/docs/changes.txt b/docs/changes.txt
index 2f10f2108f..e8cc8ad127 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -185,6 +185,7 @@ All:
 
 - Spanish translations updated (Javier San Jose)
 - fixed DLL build of db.cpp with some OpenWatcom (ABX)
+- fixed wxZlibOutputStream to properly close zlib stream
 
 All (GUI):
 
@@ -204,6 +205,7 @@ Unix:
 - typo in configure which broke AIX build fixed (Swengtoo)
 - fixed priorities of mailcap entries (David Hart)
 
+>>>>>>> 1.212.2.99
 wxMSW:
 
 - strip ampersands from strings returned by wxMenuBar::GetLabelTop()