Fixed merge conflicts

Merge branch 'beta'

Conflicts:

	ChangeLog
	src/include/functions_common.php
This commit is contained in:
Andre Lorbach 2008-08-07 16:30:32 +02:00
commit d7ab90558e

View File

@ -1,3 +1,10 @@
Version 2.3.9 (beta), 2008-08-07
- Fixed a bug in the parsing of RFC 3164 date and time stamps which
occured from the 1st to the 9th of each month. During this time, the
date was not correctly parsed.
- Enhanced detail popup window, it performs much better now and is less
annoying. It still can be turned off very easily.
- Fixed an image alignment problem of the message once and for all.
---------------------------------------------------------------------------
Version 2.5.3 (devel), 2008-08-05
- Added support to export the current visible events into a XML or CSV