Merge "app_bridgeaddchan: ability to barge into existing call"
authorMatt Jordan <mjordan@digium.com>
Thu, 19 Nov 2015 03:30:49 +0000 (21:30 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 19 Nov 2015 03:30:49 +0000 (21:30 -0600)

Trivial merge