]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_stasis: Handle re-enter stasis bridge with swap channel." into certified...
authorJoshua Colp <jcolp@digium.com>
Fri, 22 Apr 2016 22:22:06 +0000 (17:22 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 22 Apr 2016 22:22:06 +0000 (17:22 -0500)

Trivial merge