Merge "bridge_softmix: Use removed stream spots when renegotiating."
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 19 Jul 2017 15:42:51 +0000 (10:42 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 19 Jul 2017 15:42:51 +0000 (10:42 -0500)
1  2 
bridges/bridge_softmix.c

Simple merge