--- pbx.orig	2005-09-13 15:27:28.000000000 -0400
+++ pbx.c	2005-09-14 11:36:15.000000000 -0400
@@ -257,14 +257,16 @@
 	"both. Look for the condition syntax in examples or documentation." 
 	},
 
-	{ "GotoIfTime", pbx_builtin_gotoiftime,
-	"Conditional goto on current time",
-	"  GotoIfTime(<times>|<weekdays>|<mdays>|<months>?[[context|]extension|]pri):\n"
-	"If the current time matches the specified time, then branch to the specified\n"
-	"extension. Each of the elements may be specified either as '*' (for always)\n"
-	"or as a range. See the 'include' syntax for details." 
-	},
-	
+        { "GotoIfTime", pbx_builtin_gotoiftime,
+        "Conditional goto on current time",
+        "  GotoIfTime(<times>|<weekdays>|<mdays>|<months>?[label1][:label2]\n"
+        "If the current time matches the specified time, then branch to label1.\n"
+        "If the current time does not match, branch to label2.\n"
+        "label1 or label2 can be ommited\n"
+        "Each of the elements may be specified either as '*' (for always)\n"
+        "or as a range. See the 'include' syntax for details."
+        },
+
 	{ "Hangup", pbx_builtin_hangup,
 	"Unconditional hangup",
 	"  Hangup(): Unconditionally hangs up a given channel by returning -1 always.\n" 
@@ -4506,11 +4508,12 @@
 static int pbx_builtin_gotoiftime(struct ast_channel *chan, void *data)
 {
 	int res=0;
-	char *s, *ts;
+	char *s, *ts, *fs;
 	struct ast_include include;
 
 	if (!data) {
-		ast_log(LOG_WARNING, "GotoIfTime requires an argument:\n  <time range>|<days of week>|<days of month>|<months>?[[context|]extension|]priority\n");
+                ast_log(LOG_WARNING, "GotoIfTime requires an argument:\n  <time range>|<days of week>|<days of month>|<months>?[[context1|]extension1|]priority1[:[[context2|]extension2|]priority2]\n");
+
 		return -1;
 	}
 
@@ -4519,11 +4522,23 @@
 
 	/* Separate the Goto path */
 	strsep(&ts,"?");
+	
+	fs = ts;
+	/* Separate the true and false goto path */
+	strsep(&fs,":");
 
 	/* struct ast_include include contained garbage here, fixed by zeroing it on get_timerange */
 	build_timing(&include, s);
-	if (include_valid(&include))
-		res = pbx_builtin_goto(chan, (void *)ts);
+	if (include_valid(&include)) {
+                if (!((ts==NULL) ||(ast_strlen_zero(ts)))) {
+			res = pbx_builtin_goto(chan, (void *)ts);
+		}
+	}
+	else {
+		if (!((fs==NULL) || ast_strlen_zero(fs))) {
+			res = pbx_builtin_goto(chan, (void *)fs);
+		}
+	}
 	free(s);
 	return res;
 }