Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-17 21ef2a6c470b42655fee4baf5f3f4251ea2dd9ec

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