]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "chan_dahdi: Add faxdetect_timeout option." into 14
authorJoshua Colp <jcolp@digium.com>
Fri, 22 Jul 2016 09:46:36 +0000 (04:46 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 22 Jul 2016 09:46:36 +0000 (04:46 -0500)

Trivial merge