diff options
| author | Steve Murphy <murf@digium.com> | 2007-03-05 15:30:37 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2007-03-05 15:30:37 +0000 |
| commit | 96fe5e2286d1c6ddcbf9c4b2bb5c19d79245249e (patch) | |
| tree | a60b128124dfa4cad69a6958303c3dd33709f795 | |
| parent | 1db9dc0c9a9441eaae60cd26b2397068dbaec048 (diff) | |
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
| -rw-r--r-- | main/pbx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index f0a3f3657..042fb8b14 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, |