[asterisk-commits] irroot: trunk r337681 - /trunk/

[SVN commits to the Asterisk project]

Author: irroot
Date: Thu Sep 22 15:03:33 2011
New Revision: 337681

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=337681
Log:
Blocked revisions 337433 via svnmerge

........
  r337433 | irroot | 2011-09-22 08:42:42 +0200 (Thu, 22 Sep 2011) | 12 lines
  
  Revert commit r337261
  
  This commit is for trunk not version 10
  
  -----
  Adds a timeout argument to app_originate
  
  the default is 30s this will be used if the timout supplied is invalid or
  no timeout is supplied.
  -----
........

Modified:
    trunk/   (props changed)

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-10-blocked (original)
+++ branch-10-blocked Thu Sep 22 15:03:33 2011
@@ -1,1 +1,1 @@
-/branches/10:330492,330514,337640
+/branches/10:330492,330514,337433,337640