From: Joshua Colp <jcolp@digium.com>
Date: Wed, 12 Apr 2017 14:03:08 +0000 (-0500)
Subject: Merge "res_rtp_asterisk.c: Add stun_blacklist option" into 14
X-Git-Tag: 14.5.0-rc1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=443da32d49ec1ed6f1cd2ff4161ba1430791179f;p=thirdparty%2Fasterisk.git

Merge "res_rtp_asterisk.c: Add stun_blacklist option" into 14
---

443da32d49ec1ed6f1cd2ff4161ba1430791179f