]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_rtp_asterisk.c: Add stun_blacklist option" into 13
authorzuul <zuul@gerrit.asterisk.org>
Wed, 12 Apr 2017 14:01:50 +0000 (09:01 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 12 Apr 2017 14:01:50 +0000 (09:01 -0500)

Trivial merge