Merge branch 'jnorell/ispconfig3-master'

Marius Burkard

2015-12-23 69fe1ea229e5d2c3a6ecc3fc3c5438790bfc8b05

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

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'Dieser E-Mail Alias existiert bereits.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Aktiviere Greylisting';
?>