Merge branch 'v5-stable' into v6-stable

Conflicts:
	ChangeLog

1 files changed, 20 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 087b7e29..b3687b3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,22 +15,22 @@ Version 6.6.1  [v6-stable] 2012-10-??
   The testbench was also enhanced to check for these cases.
   Thanks to Georgi Georgiev for the bug report.
 - bugfix: spurios error messages from imuxsock about (non-error) EAGAIN
-  Thanks to Marius Tomaschweski for the patch.
+  Thanks to Marius Tomaschewski for the patch.
 - imklog: added $klogParseKernelTimestamp option
   When enabled, kernel message [timestamp] is converted for message time.
   Default is to use receive time as in 5.8.x and before, because the clock
   used to create the timestamp is not supposed to be as accurate as the
   monotonic clock (depends on hardware and kernel) resulting in differences
   between kernel and system messages which occurred at same time.
-  Thanks to Marius Tomaschweski for the patch.
+  Thanks to Marius Tomaschewski for the patch.
 - imklog: added $klogKeepKernelTimestamp option
   When enabled, the kernel [timestamp] remains at begin of
   each message, even it is used for the message time too.
-  Thanks to Marius Tomaschweski for the patch.
+  Thanks to Marius Tomaschewski for the patch.
 - bugfix: imklog mistakenly took kernel timestamp subseconds as nanoseconds
   ... actually, they are microseconds. So the fractional part of the 
   timestamp was not properly formatted.
-  Thanks to Marius Tomaschweski for the bug report and the patch idea.
+  Thanks to Marius Tomaschewski for the bug report and the patch idea.
 ---------------------------------------------------------------------------
 Version 6.6.0  [v6-stable] 2012-10-22
 This starts a new stable branch, based on the 6.5.x series, plus:
@@ -99,7 +99,7 @@ all these patches here are present in 6.6.0.
   Thanks to Michael Biebl for reporting & suggestions
 - bugfix: imuxsock and imklog truncated head of received message
   This happened only under some circumstances. Thanks to Marius
-  Tomaschweski, Florian Piekert and Milan Bartos for their help in
+  Tomaschewski, Florian Piekert and Milan Bartos for their help in
   solving this issue.
 - change lumberjack cookie to "@cee:" from "@cee: "
   CEE originally specified the cookie with SP, whereas other lumberjack
@@ -590,7 +590,7 @@ Version 6.1.4  [DEVEL] (rgerhards), 2011-02-18
   has been changed so this can no longer happen.
 - added pmsnare parser module (written by David Lang)
 - enhanced imfile to support non-cancel input termination
-- improved systemd socket activation thanks to Marius Tomaschweski
+- improved systemd socket activation thanks to Marius Tomaschewski
 - improved error reporting for $WorkDirectory
   non-existance and other detectable problems are now reported,
   and the work directory is NOT set in this case
@@ -684,27 +684,35 @@ expected that interfaces, even new ones, break during the initial
 ---------------------------------------------------------------------------
 Version 5.10.2  [V5-STABLE], 201?-??-??
 - bugfix: spurios error messages from imuxsock about (non-error) EAGAIN
-  Thanks to Marius Tomaschweski for the patch.
+  Thanks to Marius Tomaschewski for the patch.
 - imklog: added $klogParseKernelTimestamp option
   When enabled, kernel message [timestamp] is converted for message time.
   Default is to use receive time as in 5.8.x and before, because the clock
   used to create the timestamp is not supposed to be as accurate as the
   monotonic clock (depends on hardware and kernel) resulting in differences
   between kernel and system messages which occurred at same time.
-  Thanks to Marius Tomaschweski for the patch.
+  Thanks to Marius Tomaschewski for the patch.
 - imklog: added $klogKeepKernelTimestamp option
   When enabled, the kernel [timestamp] remains at begin of
   each message, even it is used for the message time too.
-  Thanks to Marius Tomaschweski for the patch.
+  Thanks to Marius Tomaschewski for the patch.
 - bugfix: imklog mistakenly took kernel timestamp subseconds as nanoseconds
   ... actually, they are microseconds. So the fractional part of the 
   timestamp was not properly formatted.
-  Thanks to Marius Tomaschweski for the bug report and the patch idea.
+  Thanks to Marius Tomaschewski for the bug report and the patch idea.
+- imklog: added $klogKeepKernelTimestamp option
+  When enabled, the kernel [timestamp] remains at begin of
+  each message, even it is used for the message time too.
+  Thanks to Marius Tomaschewski for the patch.
+- bugfix: imklog mistakenly took kernel timestamp subseconds as nanoseconds
+  ... actually, they are microseconds. So the fractional part of the 
+  timestamp was not properly formatted.
+  Thanks to Marius Tomaschewski for the bug report and the patch idea.
 ---------------------------------------------------------------------------
 Version 5.10.1  [V5-STABLE], 2012-10-17
 - bugfix: imuxsock and imklog truncated head of received message
   This happened only under some circumstances. Thanks to Marius
-  Tomaschweski, Florian Piekert and Milan Bartos for their help in
+  Tomaschewski, Florian Piekert and Milan Bartos for their help in
   solving this issue.
 - enable DNS resolution in imrelp
   Thanks to Apollon Oikonomopoulos for the patch
@@ -1241,7 +1249,7 @@ Version 5.7.5  [V5-BETA] (rgerhards), 2011-02-23
 Version 5.7.4  [V5-BETA] (rgerhards), 2011-02-17
 - added pmsnare parser module (written by David Lang)
 - enhanced imfile to support non-cancel input termination
-- improved systemd socket activation thanks to Marius Tomaschweski
+- improved systemd socket activation thanks to Marius Tomaschewski
 - improved error reporting for $WorkDirectory
   non-existance and other detectable problems are now reported,
   and the work directory is NOT set in this case