]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "chan_dahdi: Add faxdetect_timeout option."
authorJoshua Colp <jcolp@digium.com>
Thu, 21 Jul 2016 23:25:52 +0000 (18:25 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 21 Jul 2016 23:25:52 +0000 (18:25 -0500)

Trivial merge