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)
* changes:
  bridge_channel.c: Fix FRACK when mapping frames to the bridge.
  bridge: Fix softmix bridge deadlock.

1  2 
bridges/bridge_softmix.c

Simple merge