[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r337305 - /team/irroot/distr...

[SVN commits to the Asterisk project]

Author: irroot
Date: Wed Sep 21 06:30:34 2011
New Revision: 337305

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=337305
Log:
Merged revisions 337262,337283 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r337262 | irroot | 2011-09-21 12:46:09 +0200 (Wed, 21 Sep 2011) | 16 lines
  
  Merged revisions 337261 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/
  ........
................
  r337283 | irroot | 2011-09-21 13:21:49 +0200 (Wed, 21 Sep 2011) | 9 lines
  
  Merged revisions 337263 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/10
  
  ........
    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-trunk/   (props changed)

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Sep 21 06:30:34 2011
@@ -1,1 +1,1 @@
-/trunk:1-337274
+/trunk:1-337291