From: Joshua Colp <jcolp@digium.com>
Date: Thu, 21 Jul 2016 23:26:39 +0000 (-0500)
Subject: Merge changes from topic 'ASTERISK-26214' into 13
X-Git-Tag: 13.11.0-rc1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b8448a74be219b98e55b9128c939f8f51859c3b;p=thirdparty%2Fasterisk.git

Merge changes from topic 'ASTERISK-26214' into 13

* changes:
  res_fax: Fix FAXOPT(faxdetect) timeout option.
  chan_dahdi: Add faxdetect_timeout option.
---

0b8448a74be219b98e55b9128c939f8f51859c3b