Merge branch 'master' into 'master'

Marius Cramer

2015-09-18 5cc181a90f7d27f4ec578a8a892b4dd0ca44adf4

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

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