]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "bridge_basic: don't cache xferfailsound during an attended transfer" into 13
authorJoshua Colp <jcolp@digium.com>
Sat, 16 Jan 2016 14:29:23 +0000 (08:29 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Sat, 16 Jan 2016 14:29:23 +0000 (08:29 -0600)

Trivial merge