Merge commit 'refs/merge-requests/8' of git://gitorious.org/fish-shell/fish-shell into merge_request_8

1 files changed, 2 insertions, 2 deletions

diff --git a/builtin.c b/builtin.c
index 13694aac..41a95260 100644
--- a/builtin.c
+++ b/builtin.c
@@ -2070,7 +2070,7 @@ static int builtin_read( wchar_t **argv )
 				}
 				,
 				{
-					L"shell", required_argument, 0, 's'
+					L"shell", no_argument, 0, 's'
 				}
 				,
 				{
@@ -3871,7 +3871,7 @@ static int internal_help( wchar_t *cmd )
 {
 	CHECK( cmd, 0 );
 	return contains( cmd, L"for", L"while", L"function",
-			 L"if", L"end", L"switch" );
+			 L"if", L"end", L"switch", L"count" );
 }