[asterisk-commits] murf: trunk r57827 - in /trunk: ./ main/pbx.c

[asterisk-commits at lists.digium.com]

Author: murf
Date: Mon Mar  5 09:30:37 2007
New Revision: 57827

URL: http://svn.digium.com/view/asterisk?view=rev&rev=57827
Log:
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)
........

................

Modified:
    trunk/   (props changed)
    trunk/main/pbx.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=57827&r1=57826&r2=57827
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Mon Mar  5 09:30:37 2007
@@ -354,7 +354,7 @@
 	"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,