Merge changes from topic 'ASTERISK-27212'
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 23 Aug 2017 19:45:52 +0000 (14:45 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 23 Aug 2017 19:45:52 +0000 (14:45 -0500)
commita1e9ec40df89ea97b2612cc81eab28a6a8f61fca
tree997873bbc86b4d6d138ee155b0ea128ada8b6aeb
parent9e79976212271b49808aa533a08f00b9c59c6dda
parent17976d1b4e302b3aa7cc510109a78010d7893fe1
Merge changes from topic 'ASTERISK-27212'

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