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

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

8a925e45a2f303906ce1e6fe5e5e96409d4ec5f1