Merge "confbridge: announce to the marked users when they join an empty conference"
authorJoshua C. Colp <jcolp@digium.com>
Thu, 13 Dec 2018 14:00:06 +0000 (08:00 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 13 Dec 2018 14:00:06 +0000 (08:00 -0600)

Trivial merge