Merge branch 'beta'

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html

1 files changed, 3 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 04489253..96a83a0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,3 @@
-- fixed a memory leak when sending messages in zip-compressed format
-  Thanks to Naoya Nakazawa for analyzing this issue and providing a patch.
 ---------------------------------------------------------------------------
 Version 5.5.2  [DEVEL] (rgerhards), 2009-11-??
 - worked around an issue where omfile failed to compile on32 bit platforms
@@ -41,7 +39,7 @@ Version 5.5.0  [DEVEL] (rgerhards), 2009-11-18
   This is not done in imudp, as it natively supports epoll().
 - doc: improved description of what loadable modules can do
 ---------------------------------------------------------------------------
-Version 5.3.6  [BETA] (rgerhards), 2009-11-??
+Version 5.3.6  [BETA] (rgerhards), 2010-01-13
 - bugfix: ompgsql did not properly check the server connection in
   tryResume(), which could lead to rsyslog running in a thight loop
 - bugfix: suspension during beginTransaction() was not properly handled
@@ -59,6 +57,8 @@ Version 5.3.6  [BETA] (rgerhards), 2009-11-??
 - bugfix: ompgsql had problems with transaction support, what actually 
   rendered it unsuable. Thanks to forum user "horhe" for alerting me
   on this bug and helping to debug/fix it!
+- bugfix: memory leak when sending messages in zip-compressed format
+  Thanks to Naoya Nakazawa for analyzing this issue and providing a patch.
 - worked around an issue where omfile failed to compile on 32 bit platforms
   under some circumstances (this smells like a gcc problem, but a simple
   solution was available). Thanks to Kenneth Marshall for some advice.