Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-14 80c6a7f559ceb100b82921019bab3a0c5ed2ae2a

 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';
?>