From 96fe5e2286d1c6ddcbf9c4b2bb5c19d79245249e Mon Sep 17 00:00:00 2001 From: Steve Murphy Date: Mon, 5 Mar 2007 15:30:37 +0000 Subject: [PATCH] Merged revisions 57826 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r57826 | murf | 2007-03-05 08:20:17 -0700 (Mon, 05 Mar 2007) | 9 lines Merged revisions 57825 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r57825 | murf | 2007-03-05 07:53:57 -0700 (Mon, 05 Mar 2007) | 1 line Fixed a typo introduced via 9156 (either the gotos or their doc strings are wrong) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57827 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/pbx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/pbx.c b/main/pbx.c index f0a3f36578..042fb8b14b 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -354,7 +354,7 @@ static struct pbx_builtin { "channel is hung up, and the execution of instructions on the channel is terminated.\n" "Remember that this command can set the current context, and if the context specified\n" "does not exist, then it will not be able to find any 'h' or 'i' extensions there, and\n" - "and the channel and call will both be terminated!\n" + "the channel and call will both be terminated!\n" }, { "GotoIfTime", pbx_builtin_gotoiftime,