From: Paul Belanger Date: Fri, 29 Jul 2011 05:27:22 +0000 (+0000) Subject: Merged revisions 330162 via svnmerge from X-Git-Tag: 11.0.0-beta1~1304 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6a9795b9ad7623ea55f9fa768c95dbc98a3b521;p=thirdparty%2Fasterisk.git Merged revisions 330162 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/10 ........ r330162 | pabelanger | 2011-07-29 01:25:18 -0400 (Fri, 29 Jul 2011) | 4 lines Fix typo pointed out on #asterisk Thanks notten ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330163 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index 76b4b266e0..6e992ebd31 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -2224,7 +2224,7 @@ static struct ast_cli_entry cli_confbridge[] = { AST_CLI_DEFINE(handle_cli_confbridge_list, "List conference bridges and participants."), AST_CLI_DEFINE(handle_cli_confbridge_kick, "Kick participants out of conference bridges."), AST_CLI_DEFINE(handle_cli_confbridge_mute, "Mute a participant."), - AST_CLI_DEFINE(handle_cli_confbridge_unmute, "Mute a participant."), + AST_CLI_DEFINE(handle_cli_confbridge_unmute, "Unmute a participant."), AST_CLI_DEFINE(handle_cli_confbridge_lock, "Lock a conference."), AST_CLI_DEFINE(handle_cli_confbridge_unlock, "Unlock a conference."), AST_CLI_DEFINE(handle_cli_confbridge_start_record, "Start recording a conference"),