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 a20e325af200b7076abc8d260231ad0451f018f4..a82720cf78776959ce0791de8d845409c0c69bc1 100644 (file)
--- 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;