Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

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

@@ -3,5 +3,8 @@
$wb['server_id_txt'] = 'Servidor';
$wb['ip_address_txt'] = 'Endereço IP';
$wb['add_new_record_txt'] = 'Adicionar novo Endereço IP';
$wb['client_id_txt'] = 'Client';
$wb['virtualhost_txt'] = 'HTTP Vhost';
$wb['virtualhost_port_txt'] = 'HTTP Ports';
$wb['ip_type_txt'] = 'Type';
?>