From: Joshua Colp <jcolp@digium.com>
Date: Sat, 18 Mar 2017 00:49:21 +0000 (-0500)
Subject: Merge "app_confbridge: Fix ConfbridgeTalking AMI event description."
X-Git-Tag: 15.0.0-beta1~265
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=317405ce694dfa39e7b4da6aa72d748302c7bd5c;p=thirdparty%2Fasterisk.git

Merge "app_confbridge: Fix ConfbridgeTalking AMI event description."
---

317405ce694dfa39e7b4da6aa72d748302c7bd5c