From: Joshua Colp <jcolp@digium.com>
Date: Fri, 5 Feb 2016 17:50:00 +0000 (-0600)
Subject: Merge topic 'ASTERISK-20987' into certified/11.6
X-Git-Tag: certified/11.6-cert13~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f24159ea131b0218512ea6bb2e0980f2795949c;p=thirdparty%2Fasterisk.git

Merge topic 'ASTERISK-20987' into certified/11.6

* changes:
  app_confbridge: Make non-admin users join a muted conference muted.
  app_confbridge: Allow muting of users waiting to enter a ConfBridge
  app_confbridge: Fix bug - users with startmuted set don't start muted
  confbridge: Separate user muting from system muting overrides.
---

8f24159ea131b0218512ea6bb2e0980f2795949c