From: Joshua Colp <jcolp@digium.com>
Date: Tue, 6 Jun 2017 10:01:17 +0000 (-0500)
Subject: Merge "res_srtp: Add support for libsrtp2"
X-Git-Tag: 15.0.0-beta1~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97abf6d4759627aec3ef65e43413214b192918a5;p=thirdparty%2Fasterisk.git

Merge "res_srtp: Add support for libsrtp2"
---

97abf6d4759627aec3ef65e43413214b192918a5