From: Joshua Colp <jcolp@digium.com>
Date: Fri, 17 Mar 2017 21:08:31 +0000 (-0500)
Subject: Merge "app_confbridge: Fix ConfbridgeTalking AMI event description." into 13
X-Git-Tag: 13.15.0-rc1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e76947bd88a978878717bb0688db1a9e3f596715;p=thirdparty%2Fasterisk.git

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

e76947bd88a978878717bb0688db1a9e3f596715