Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-30 f686264ad6d82cfaf4e401da2e259880f57bfade

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