Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

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