automerge commit

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 594a638226f79e33749c0ceaa421835bda4855c6..ce6b545fd73be81f0da6c362cdb6304e97996493 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -6353,7 +6353,7 @@ static int load_config(void)
                return 0;
        } else {
                ast_mutex_unlock(&vmlock);
-               ast_log(LOG_WARNING, "Failed to load configuration file. Module not activated.\n");
+               ast_log(LOG_WARNING, "Failed to load configuration file.\n");
                return 0;
        }
 }