Merge "bridge: Kick channel from bridge if hung up during action."
authorMark Michelson <mmichelson@digium.com>
Mon, 24 Aug 2015 22:12:06 +0000 (17:12 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 24 Aug 2015 22:12:06 +0000 (17:12 -0500)

Trivial merge