Andre Lorbach 54dcacb25e Fixed merge conflicts
Merge branch 'beta'

Conflicts:

	ChangeLog
	src/include/functions_common.php
2008-08-27 13:42:01 +02:00
2008-04-02 18:02:33 +02:00
2008-08-27 13:19:30 +02:00
2008-08-27 13:42:01 +02:00
Description
Adiscon LogAnalyzer, a web frontend to log data from the same folks the created rsyslog
7.6 MiB
Languages
PHP 89.9%
HTML 6.1%
CSS 3.5%
JavaScript 0.5%