[asterisk-commits] irroot: branch irroot/distrotech-customers-10 r337304 - /team/irroot/distrote...

[SVN commits to the Asterisk project]

Author: irroot
Date: Wed Sep 21 06:27:28 2011
New Revision: 337304

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=337304
Log:
Merged revisions 337261,337263 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r337261 | irroot | 2011-09-21 12:42:06 +0200 (Wed, 21 Sep 2011) | 10 lines
  
  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.
  
  Contributed by: jacco (thank you for the work)
  
  Review: https://reviewboard.asterisk.org/r/1310/
........
  r337263 | irroot | 2011-09-21 13:15:48 +0200 (Wed, 21 Sep 2011) | 1 line
  
  Whitespace fixup from SRTP patch
........

Modified:
    team/irroot/distrotech-customers-10/   (props changed)

Propchange: team/irroot/distrotech-customers-10/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Sep 21 06:27:28 2011
@@ -1,1 +1,1 @@
-/branches/10:1-337230
+/branches/10:1-337291