Merged revisions 332756 via svnmerge from
authorMatthew Nicholson <mnicholson@digium.com>
Mon, 22 Aug 2011 16:31:59 +0000 (16:31 +0000)
committerMatthew Nicholson <mnicholson@digium.com>
Mon, 22 Aug 2011 16:31:59 +0000 (16:31 +0000)
commit91d3a7d3a1d5996ff66f4905beaf797f5e5cd47c
treeb11fe836b7f4f9767f250b6189e865c56d9dad2b
parent3a50145436c024671569313fd428aecee7039ad3
Merged revisions 332756 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r332756 | mnicholson | 2011-08-22 11:29:45 -0500 (Mon, 22 Aug 2011) | 4 lines

  add a way to disable and/or modify the gateway timeout

  ASTERISK-18219
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@332757 65c4cc65-6c06-0410-ace0-fbb531ad65f3
include/asterisk/res_fax.h
res/res_fax.c