Merge "bridge_softmix.c: Restored softmix_bridge_leave() shortcut exit."
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 23 Aug 2017 17:21:47 +0000 (12:21 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 23 Aug 2017 17:21:47 +0000 (12:21 -0500)
1  2 
bridges/bridge_softmix.c

Simple merge