Merge branch 'v7-stable'

Conflicts:
	configure.ac
	doc/manual.html
This commit is contained in:
Rainer Gerhards 2012-12-07 15:14:49 +01:00
commit 353bcab3be

View File

@ -105,7 +105,7 @@ Version 7.3.0 [devel] 2012-10-09
This was achieved by somewhat reducing the robustness of the zip archive.
This is controlled by the new action parameter "VeryReliableZip".
----------------------------------------------------------------------------
Version 7.2.4 [v7-stable] 2012-10-??
Version 7.2.4 [v7-stable] 2012-12-07
- enhance: permit RFC3339 timestamp in local log socket messages
Thanks to Sebastien Ponce for the patch.
- imklog: added ParseKernelTimestamp parameter (import from 5.10.2)