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

Merge topic 'ASTERISK-20987' into 11

* changes:
  app_confbridge.c: Update CONFBRIDGE and CONFBRIDGE_INFO documentation.
  app_confbridge: Make non-admin users join a muted conference muted.
---

cc510376ec90359276d71e05bc7a8dd35589f967