Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 05beae43cfeb15ea89b984d36105dcdbdffd0975

1
2
3
4
<?php
$wb['list_head_txt'] = 'Configurazione Server';
$wb['server_name_txt'] = 'Server';
?>