[svn-commits] jpeeler: branch 1.6.1 r177358 - in /branches/1.6.1: ./ main/features.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Thu Feb 19 09:57:44 2009
New Revision: 177358

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

........
  r177356 | jpeeler | 2009-02-19 09:56:31 -0600 (Thu, 19 Feb 2009) | 4 lines
  
  Fix mismerge from revision 176708 pointed out by Kaloyan Kovachev on the
  asterisk-dev mailing list. Thanks!
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/features.c

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

Modified: branches/1.6.1/main/features.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/features.c?view=diff&rev=177358&r1=177357&r2=177358
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Thu Feb 19 09:57:44 2009
@@ -2473,7 +2473,6 @@
 				config->feature_timer -= diff;
 			}
 
-			config->feature_timer -= diff;
 			if (hasfeatures) {
 				/* Running on backup config, meaning a feature might be being
 				   activated, but that's no excuse to keep things going