From: Joshua Colp <jcolp@digium.com>
Date: Fri, 5 Feb 2016 17:49:14 +0000 (-0600)
Subject: Merge topic 'ASTERISK-20987'
X-Git-Tag: 14.0.0-beta1~411
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e541d9cf34ad32af697ca222191f60261e26a5c7;p=thirdparty%2Fasterisk.git

Merge topic 'ASTERISK-20987'

* changes:
  app_confbridge: Add ability to get the muted conference state.
  app_confbridge.c: Update CONFBRIDGE and CONFBRIDGE_INFO documentation.
  app_confbridge: Make non-admin users join a muted conference muted.
---

e541d9cf34ad32af697ca222191f60261e26a5c7