Merge branch 'stable-3.1'

Marius Burkard

2016-05-04 c3189ce6c7301c3ec17878fd3918f31d0d3cb18a

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

@@ -4,4 +4,4 @@
$wb['list_head_txt'] = 'Mapeos IP';
$wb['server_id_txt'] = 'Servidor';
$wb['source_ip_txt'] = 'IP de origen';
?>
?>