Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-12 51e1dde2aa5c31b01f77479fe3fc86dffd2c8f29

 interface/web/strengthmeter/lib/lang/de_strengthmeter.lng

@@ -4,5 +4,5 @@
$wb['password_strength_2_txt'] = 'Mittel';
$wb['password_strength_3_txt'] = 'Gut';
$wb['password_strength_4_txt'] = 'Stark';
$wb['password_strength_5_txt'] = 'sehr stark';
$wb['password_strength_5_txt'] = 'Sehr stark';
?>