From: Joshua Colp <jcolp@digium.com>
Date: Mon, 29 Aug 2016 22:06:17 +0000 (-0500)
Subject: Merge "pjproject_bundled:  Disable srtp use by pjmedia" into 14
X-Git-Tag: 14.1.0-rc1~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a804abbe99cdef5771c60a6f2c61697991a29ad0;p=thirdparty%2Fasterisk.git

Merge "pjproject_bundled:  Disable srtp use by pjmedia" into 14
---

a804abbe99cdef5771c60a6f2c61697991a29ad0