]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "Local channels: Alternate solution to ringback problem." into certified/13.1
authorJoshua Colp <jcolp@digium.com>
Fri, 28 Aug 2015 11:30:55 +0000 (06:30 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 28 Aug 2015 11:30:55 +0000 (06:30 -0500)

Trivial merge