From: Automerge Script <automerge@asterisk.org>
Date: Mon, 2 Jul 2007 22:28:05 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.21-netsec~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09213b43a299f9a4f7d192856fdfb1b2f22840a9;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@72983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/say.c b/say.c
index a20e325af2..a82720cf78 100644
--- a/say.c
+++ b/say.c
@@ -4081,11 +4081,6 @@ int ast_say_date_with_format_fr(struct ast_channel *chan, time_t time, const cha
 			case 'k':
 				/* 24-Hour */
 				res = ast_say_number(chan, tm.tm_hour, ints, lang, (char * ) NULL);
-				if (!res) {
-					if (format[offset] == 'H') {
-						res = wait_file(chan,ints, "digits/oclock",lang);
-					}
-				}
 				if (!res)
 					res = wait_file(chan,ints, "digits/oclock",lang);
 				break;