From: Jenkins2 <jenkins2@gerrit.asterisk.org>
Date: Thu, 22 Mar 2018 13:39:23 +0000 (-0500)
Subject: Merge "bridge_softmix: Clear "talking" when a channel is put on hold" into 15
X-Git-Tag: 15.4.0-rc1~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f13131b5cdee219841cc767e01101472ebd46606;p=thirdparty%2Fasterisk.git

Merge "bridge_softmix: Clear "talking" when a channel is put on hold" into 15
---

f13131b5cdee219841cc767e01101472ebd46606