Merge remote-tracking branch 'sebj/master' and tidied up merged code

Marius Cramer

2013-11-18 015dffdc589b396d72092583cc526674f0a9a8d5

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

@@ -17,4 +17,5 @@
$wb["limit_maildomain_txt"] = 'The max. number of email domains for your account is reached.';
$wb["policy_txt"] = 'Spamfilter';
$wb["no_policy"] = '- not enabled -';
?>
$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
?>