Merge branch 'stable-3.1'

Marius Burkard

2016-02-12 b0f818efec0b74741d6fa53d0e86a95065d4e2d1

 interface/web/sites/lib/lang/br_ftp_user.lng

@@ -31,6 +31,5 @@
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
$wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
$wb['directory_error_regex'] = 'Invalid directory';
$wb['expires_txt'] = 'Expire at';
?>