Merge "bridge.c: Crash during attended transfer when missing a local channel half"
authorzuul <zuul@gerrit.asterisk.org>
Thu, 3 Mar 2016 23:37:45 +0000 (17:37 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 3 Mar 2016 23:37:45 +0000 (17:37 -0600)

Trivial merge