]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "bridge.c: Fixed race condition during attended transfer" into certified/13.1
authorJoshua Colp <jcolp@digium.com>
Fri, 22 Apr 2016 22:21:56 +0000 (17:21 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 22 Apr 2016 22:21:56 +0000 (17:21 -0500)

Trivial merge