Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-30 f686264ad6d82cfaf4e401da2e259880f57bfade

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

@@ -8,4 +8,3 @@
$wb['password_mismatch_txt'] = 'Lösenorden matchar inte';
$wb['password_match_txt'] = 'Lösenorden matchar';
?>