Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-26 b3e7785b3ab5ea70675e0d944b3a746464c4143f

1
2
3
4
5
6
7
<?php
$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
$wb['spamfilter_txt'] = 'Spamfilter';
$wb['email_txt'] = 'Email';
$wb['no_policy'] = '- not enabled -';
$wb['policy_txt'] = 'Policy';
?>