Merge "bridge_softmix: Don't reorder streams on participant leaving."
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Tue, 18 Jul 2017 13:13:15 +0000 (08:13 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 18 Jul 2017 13:13:15 +0000 (08:13 -0500)
1  2 
bridges/bridge_softmix.c

Simple merge