Andre Lorbach a43c189a88 Fixed merge conflics
Merge branch 'beta' into devel

Conflicts:

	src/include/functions_common.php
2008-10-22 16:23:20 +02:00
2008-10-14 18:05:43 +02:00
2008-10-22 16:23:20 +02:00
2008-10-22 16:21:46 +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%