[svn-commits] tilghman: branch 1.6.0 r162469 - in /branches/1.6.0: ./ apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Dec  9 17:11:21 2008
New Revision: 162469

URL: http://svn.digium.com/view/asterisk?view=rev&rev=162469
Log:
Merged revisions 162466 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r162466 | tilghman | 2008-12-09 17:10:34 -0600 (Tue, 09 Dec 2008) | 9 lines
  
  Merged revisions 162463 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r162463 | tilghman | 2008-12-09 17:08:53 -0600 (Tue, 09 Dec 2008) | 2 lines
    
    Oops, should be "tz", not "zonetag".
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_voicemail.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_voicemail.c?view=diff&rev=162469&r1=162468&r2=162469
==============================================================================
--- branches/1.6.0/apps/app_voicemail.c (original)
+++ branches/1.6.0/apps/app_voicemail.c Tue Dec  9 17:11:21 2008
@@ -9534,7 +9534,7 @@
 				adsiver = atoi(val);
 			}
 		}
-		if ((val = ast_variable_retrieve(cfg, "general", "zonetag"))) {
+		if ((val = ast_variable_retrieve(cfg, "general", "tz"))) {
 			ast_copy_string(zonetag, val, sizeof(zonetag));
 		}
 		if ((val = ast_variable_retrieve(cfg, "general", "emailsubject"))) {