Merge "app_confbridge: Fix ConfbridgeTalking AMI event description."
authorJoshua Colp <jcolp@digium.com>
Sat, 18 Mar 2017 00:49:21 +0000 (19:49 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Sat, 18 Mar 2017 00:49:21 +0000 (19:49 -0500)

Trivial merge