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

Merge topic 'ASTERISK-20987' into 13

* 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.
---

2177dbea50749456d909a1625a7aeda3f8c4979f