From: Joshua Colp <jcolp@digium.com>
Date: Thu, 25 Oct 2018 12:45:23 +0000 (-0500)
Subject: Merge "bridge_softmix:  Add SDP "label" attribute to streams"
X-Git-Tag: 17.0.0-rc1~295
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7b22ee13329e1d840a98f88aeedfbfdbfe56579;p=thirdparty%2Fasterisk.git

Merge "bridge_softmix:  Add SDP "label" attribute to streams"
---

e7b22ee13329e1d840a98f88aeedfbfdbfe56579