From: Jenkins2 <jenkins2@gerrit.asterisk.org>
Date: Mon, 7 Aug 2017 23:52:35 +0000 (-0500)
Subject: Merge "bridge: Fix stream topology/participant locking and video misrouting." into 15
X-Git-Tag: 15.1.0-rc1~136
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b24854e16b4a4ae7197a16204a64fd3968bfb4b8;p=thirdparty%2Fasterisk.git

Merge "bridge: Fix stream topology/participant locking and video misrouting." into 15
---

b24854e16b4a4ae7197a16204a64fd3968bfb4b8