From: Joshua Colp <jcolp@digium.com>
Date: Fri, 22 Jul 2016 09:46:29 +0000 (-0500)
Subject: Merge "res_pjsip: Add fax_detect_timeout endpoint option." into 14
X-Git-Tag: 14.0.0-beta1~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5516361441b3ca38242a47b5ff0f5cbcd8e1ac5;p=thirdparty%2Fasterisk.git

Merge "res_pjsip: Add fax_detect_timeout endpoint option." into 14
---

e5516361441b3ca38242a47b5ff0f5cbcd8e1ac5