Merge branch 'beta'

Conflicts:

	ChangeLog

1 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index b26ae3a9..d06154f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,8 +62,9 @@ Version 3.21.0  [DEVEL] (rgerhards), 2008-07-18
 - imported all changes from 3.18.1 until today (some quite important,
   see below)
 ---------------------------------------------------------------------------
-Version 3.19.11 [BETA] (rgerhards), 2008-??-??
-- included fixes from v3-stable
+Version 3.19.11 [BETA] (rgerhards), 2008-08-25
+This is a refresh of the beta. No beta-specific fixes have been added.
+- included fixes from v3-stable (most importantly 3.18.3)
 ---------------------------------------------------------------------------
 Version 3.19.10 [BETA] (rgerhards), 2008-07-15
 - start of a new beta branch based on former 3.19 devel branch
@@ -222,7 +223,10 @@ Version 3.19.0 (rgerhards), 2008-05-06
 - -c option no longer must be the first option - thanks to varmjofekoj
   for the patch
 ---------------------------------------------------------------------------
-Version 3.18.3 (rgerhards), 2008-08-??
+Version 3.18.3 (rgerhards), 2008-08-18
+- bugfix: imfile could cause a segfault upon rsyslogd HUP and termination
+  Thanks to lperr for an excellent bug report that helped detect this
+  problem.
 - enhanced ommysql to support custom port to connect to server
   Port can be set via new $ActionOmmysqlServerPort config directive
   Note: this was a very minor change and thus deemed appropriate to be