]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_rtp_asterisk: Add ice_blacklist option" into 13
authorzuul <zuul@gerrit.asterisk.org>
Wed, 19 Oct 2016 20:02:16 +0000 (15:02 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 19 Oct 2016 20:02:16 +0000 (15:02 -0500)

Trivial merge