]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "bridge_softmix.c: Restored softmix_bridge_leave() shortcut exit." into 15
authorJoshua Colp <jcolp@digium.com>
Wed, 23 Aug 2017 17:43:47 +0000 (12:43 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 23 Aug 2017 17:43:47 +0000 (12:43 -0500)
1  2 
bridges/bridge_softmix.c

Simple merge