Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

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

@@ -13,4 +13,4 @@
$wb['vserver_server_txt'] = 'Servidor VServer';
$wb['web_server_txt'] = 'Servidor web';
$wb['xmpp_server_txt'] = 'Servidor XMPP';
?>
?>