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

Merge changes from topic 'ASTERISK-27212' into 15

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

a52be09f822f00828806ef52b9e5ea69e1e0dae2