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

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

c98c1b3f744fba671ff23a212bb970cc2d38b203