From: Joshua Colp <jcolp@digium.com>
Date: Wed, 6 Jun 2018 10:46:28 +0000 (-0500)
Subject: Merge "bridge_channel.c: Fix Deadlock when using Local channels and fax gateway"... 
X-Git-Tag: 13.22.0-rc1~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5a186d72382b6677630e77a9c4dd20dc3808a5b;p=thirdparty%2Fasterisk.git

Merge "bridge_channel.c: Fix Deadlock when using Local channels and fax gateway" into 13
---

b5a186d72382b6677630e77a9c4dd20dc3808a5b