Merged revisions 223225 via svnmerge from
authorMatthew Nicholson <mnicholson@digium.com>
Fri, 9 Oct 2009 18:34:08 +0000 (18:34 +0000)
committerMatthew Nicholson <mnicholson@digium.com>
Fri, 9 Oct 2009 18:34:08 +0000 (18:34 +0000)
commit0d4726b0a2f135fc5bdc97acf6178877a8606e3f
tree6b1d931cf838995fe6113614bc712c5edb37f90e
parent280859e51c8af05ea77135cd55c6a1c0b886d723
Merged revisions 223225 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r223225 | mnicholson | 2009-10-09 13:20:11 -0500 (Fri, 09 Oct 2009) | 8 lines

  Signal timeouts by returning AST_CONTROL_RINGING when originating calls.
  (closes issue #15104)
  Reported by: nblasgen
  Patches:
        manager-timeout1.diff uploaded by mnicholson (license 96)
  Tested by: nblasgen, mnicholson
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@223273 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/channel.c