Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-12 51e1dde2aa5c31b01f77479fe3fc86dffd2c8f29

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

@@ -6,4 +6,3 @@
$wb['email_txt'] = 'E-Mail Adresse';
$wb['add_new_record_txt'] = 'Neuen E-Mail Alias hinzufügen';
?>