]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "bridge.c: Fixed race condition during attended transfer" into 13
authorMark Michelson <mmichelson@digium.com>
Mon, 13 Jul 2015 19:51:22 +0000 (14:51 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 13 Jul 2015 19:51:22 +0000 (14:51 -0500)

Trivial merge