Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-17 21ef2a6c470b42655fee4baf5f3f4251ea2dd9ec

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

@@ -1,5 +1,4 @@
<?php

$wb['list_head_txt'] = 'Server configuratie';

$wb['server_name_txt'] = 'Servernaam';

?>



<?php
$wb['list_head_txt'] = 'Server configuratie';
$wb['server_name_txt'] = 'Server';
?>