Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-30 f686264ad6d82cfaf4e401da2e259880f57bfade

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

@@ -7,5 +7,7 @@
$wb['domain_txt'] = 'Domain';
$wb["source_txt"] = 'Source Email';
$wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['send_as_txt'] = 'Send as';
$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
$wb['greylisting_txt'] = 'Enable greylisting';
?>