Merge branch 'stable-3.1'

Marius Burkard

2016-05-04 c3189ce6c7301c3ec17878fd3918f31d0d3cb18a

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