Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-30 f686264ad6d82cfaf4e401da2e259880f57bfade

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

@@ -4,5 +4,5 @@
$wb['server_id_txt'] = 'Serveur';
$wb['dbtable_txt'] = 'Table DB';
$wb['action_txt'] = 'Action';
$wb['status_txt'] = 'Status';
$wb['status_txt'] = 'Statut';
?>