Merged revisions 337261 via svnmerge from
authorGregory Nietsky <gregory@distrotech.co.za>
Wed, 21 Sep 2011 10:46:09 +0000 (10:46 +0000)
committerGregory Nietsky <gregory@distrotech.co.za>
Wed, 21 Sep 2011 10:46:09 +0000 (10:46 +0000)
commit8f10934c185d376fbc90e49cece4c92383f78eb5
treecb626aae6e18a108927a66f951b1f0bd72a3de11
parent7b08b2cf53393b26050320dcdfee6edbecae94f7
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/
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337262 65c4cc65-6c06-0410-ace0-fbb531ad65f3
CHANGES
apps/app_originate.c