Merge "app_confbridge: ConfbridgeList event has standard channel shapshot headers."
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 7 Feb 2018 12:42:20 +0000 (06:42 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 7 Feb 2018 12:42:20 +0000 (06:42 -0600)

Trivial merge