Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-10-13 43418672d32ee65ee6060314d4e66c3c44a8b0cb

 interface/web/admin/lib/lang/fr_server_config_list.lng

@@ -1,6 +1,4 @@
<?php
$wb['list_head_txt'] = "Configuration du serveur";
$wb['server_name_txt'] = "Serveur";
$wb['list_head_txt'] = 'Configuration du serveur';
$wb['server_name_txt'] = 'Serveur';
?>