From: Joshua Colp <jcolp@digium.com>
Date: Thu, 21 Jul 2016 21:54:32 +0000 (-0500)
Subject: Merge "res_pjsip: Add fax_detect_timeout endpoint option." into 13
X-Git-Tag: 13.11.0-rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efebb1b9e0c36690b890a891d2735ee84867a522;p=thirdparty%2Fasterisk.git

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

efebb1b9e0c36690b890a891d2735ee84867a522