Merge branch 'stable-3.1'

Marius Burkard

2016-04-06 df8e42319fc83110bd2db2b96b97367f42c71c6c

 interface/web/mailuser/lib/lang/es_mail_user_spamfilter.lng

old mode 100644
new mode 100755
@@ -1,7 +1,7 @@
<?php
$wb['mailbox_spamfilter_txt'] = 'Filtro de spam';
$wb['spamfilter_txt'] = 'Filtro de spam';
$wb['email_txt'] = 'Correo';
$wb['mailbox_spamfilter_txt'] = 'Filtro de spam';
$wb['no_policy'] = '- no habilitado -';
$wb['policy_txt'] = 'Directiva';
?>
$wb['spamfilter_txt'] = 'Filtro de spam';
?>