Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-30 5e981c0c36166071298a6b82cead9f81310842ab

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

old mode 100644
new mode 100755
@@ -1,7 +1,7 @@
<?php
$wb['list_head_txt'] = 'IP Mappings';
$wb['server_id_txt'] = 'Server';
$wb['source_ip_txt'] = 'Source IP';
$wb['destination_ip_txt'] = 'Destination IP';
$wb['active_txt'] = 'Active';
?>
$wb['active_txt'] = 'Activo';
$wb['destination_ip_txt'] = 'IP de destino';
$wb['list_head_txt'] = 'Mapeos IP';
$wb['server_id_txt'] = 'Servidor';
$wb['source_ip_txt'] = 'IP de origen';
?>