From: Automerge script <automerge@asterisk.org>
Date: Mon, 8 May 2006 12:06:46 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.8-netsec~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4b164737411b732cf4370dc543495b647d2508b;p=thirdparty%2Fasterisk.git

automerge commit

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

diff --git a/res/res_features.c b/res/res_features.c
index 599ad398f3..f83cadeccf 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -742,7 +742,7 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st
 					}
 					if (!ast_strlen_zero(xfersound) && !ast_streamfile(transferer, xfersound, transferer->language)) {
 						if (ast_waitstream(transferer, "") < 0) {
-							ast_log(LOG_WARNING, "Failed to play courtesy tone!\n");
+							ast_log(LOG_WARNING, "Failed to play transfer sound!\n");
 						}
 					}
 					ast_moh_stop(transferee);
@@ -806,7 +806,7 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st
 	
 					if (!ast_strlen_zero(xfersound) && !ast_streamfile(newchan, xfersound, newchan->language)) {
 						if (ast_waitstream(newchan, "") < 0) {
-							ast_log(LOG_WARNING, "Failed to play courtesy tone!\n");
+							ast_log(LOG_WARNING, "Failed to play transfer sound!\n");
 						}
 					}
 					ast_bridge_call_thread_launch(tobj);