Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

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