From: Joshua Colp <jcolp@digium.com>
Date: Wed, 10 Jan 2018 14:19:39 +0000 (-0600)
Subject: Merge "bridge_softmix: Fix sfu_append_source_streams test." into 15
X-Git-Tag: 15.3.0-rc1~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0efdd1033c0fdc425df922ed71a6fe422f5120e;p=thirdparty%2Fasterisk.git

Merge "bridge_softmix: Fix sfu_append_source_streams test." into 15
---

e0efdd1033c0fdc425df922ed71a6fe422f5120e