Merge branch 'master' into 'master'

Marius Cramer

2014-10-24 2d5fcd53c19a65b9c968a1db2e9af643537379c3

 interface/web/mail/lib/lang/en.lng

@@ -45,5 +45,7 @@
$wb['Postfix Blacklist'] = 'Postfix Blacklist';
$wb['Content Filter'] = 'Content Filter';
$wb['Global Filters'] = 'Global Filters';

$wb['Domain Alias'] = 'Domain Alias';
$wb["Relay Recipients"] = 'Relay Recipients';
$wb['Mailbox quota'] = 'Mailbox quota';
?>