Merge from 1.4

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46224 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

@@ -16965,7 +16965,7 @@ static struct ast_cli_entry cli_sip[] = {
 	sip_show_registry, "List SIP registration status",
 	show_reg_usage },
-	{ { "sip", "list", "settings", NULL },
+	{ { "sip", "show", "settings", NULL },
 	sip_show_settings, "List SIP global settings",
 	show_settings_usage },