Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-15 d302d8e556da5b1dcd9ce4f9ec086a0e4aa52dd6

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