Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 interface/web/monitor/lib/lang/de_syslog_list.lng

@@ -2,6 +2,6 @@
$wb['list_head_txt'] = 'ISPConfig Protokoll';
$wb['tstamp_txt'] = 'Datum';
$wb['server_id_txt'] = 'Server';
$wb['loglevel_txt'] = 'Protokolllevel';
$wb['loglevel_txt'] = 'Protokoll-Level';
$wb['message_txt'] = 'Nachricht';
?>