Merge branch 'master' into 'master'

Marius Cramer

2014-10-29 871298f2b5dc76c4bdc8501464aeeeaa5a44677e

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

@@ -32,4 +32,5 @@
$wb['directory_error_regex'] = 'Invalid directory';
$wb['shell_error_regex'] = 'Invalid shell';
$wb['invalid_username_txt'] = 'Invalid Username';
$wb['directory_error_notinweb'] = 'The directory has to be inside the web root.';
?>