From: Jenkins2 <jenkins2@gerrit.asterisk.org>
Date: Wed, 23 Aug 2017 19:45:52 +0000 (-0500)
Subject: Merge changes from topic 'ASTERISK-27212'
X-Git-Tag: 16.0.0-rc1~858
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a1e9ec40df89ea97b2612cc81eab28a6a8f61fca;p=thirdparty%2Fasterisk.git

Merge changes from topic 'ASTERISK-27212'

* changes:
  bridge_channel.c: Fix FRACK when mapping frames to the bridge.
  bridge: Fix softmix bridge deadlock.
---

a1e9ec40df89ea97b2612cc81eab28a6a8f61fca