Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

1
2
3
4
5
6
7
<?php
$wb["list_head_txt"] = 'ISPConfig Log';
$wb["tstamp_txt"] = 'Date';
$wb["server_id_txt"] = 'Server';
$wb["loglevel_txt"] = 'Loglevel';
$wb["message_txt"] = 'Message';
?>