Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-12 51e1dde2aa5c31b01f77479fe3fc86dffd2c8f29

 interface/web/mailuser/lib/lang/de_mail_user_password.lng

@@ -1,5 +1,5 @@
<?php
$wb['mailbox_password_txt'] = 'Mailbox-Passwort';
$wb['mailbox_password_txt'] = 'E-Mailkonto Passwort';
$wb['password_txt'] = 'Passwort';
$wb['password_strength_txt'] = 'Passwortkomplexität';
$wb['email_txt'] = 'E-Mail';