Andre Lorbach f47117a16e Fixed merge conflicts
Merge branch 'beta' into devel

Conflicts:

	src/include/functions_common.php
2008-09-25 16:34:51 +02:00
2008-09-17 14:47:03 +02:00
2008-09-25 16:34:51 +02:00
2008-09-25 16:33:54 +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%