aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authormurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-05 15:20:17 +0000
committermurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-05 15:20:17 +0000
commit304723a95b0701d6ee89eabb8008d5cafba324ea (patch)
tree30e287f730e4415ab117450a878187c2e0bf22be /main
parent8a921603bf83c5ce9ae3ac248faf4657425f23a8 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@57826 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/pbx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c
index 57b476fe3..203a057f6 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -341,7 +341,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,