Merge branch 'stable-3.1'

Marius Burkard

2016-05-04 c3189ce6c7301c3ec17878fd3918f31d0d3cb18a

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

@@ -8,4 +8,4 @@
$wb['server_id_txt'] = 'Servidor';
$wb['virtualhost_port_txt'] = 'Puertos HTTP';
$wb['virtualhost_txt'] = 'Nombre de host virtual HTTP (NameVirtualHost)';
?>
?>