From: zuul <zuul@gerrit.asterisk.org>
Date: Tue, 26 Apr 2016 02:08:15 +0000 (-0500)
Subject: Merge "bridge_softmix.c: Fix crash if channel fails to join mixing tech."
X-Git-Tag: 14.0.0-beta1~235
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=807a765cfb924aca07936379b9802e141f833d38;p=thirdparty%2Fasterisk.git

Merge "bridge_softmix.c: Fix crash if channel fails to join mixing tech."
---

807a765cfb924aca07936379b9802e141f833d38