From: zuul <zuul@gerrit.asterisk.org>
Date: Mon, 29 Aug 2016 21:50:25 +0000 (-0500)
Subject: Merge "pjproject_bundled:  Disable srtp use by pjmedia" into 13
X-Git-Tag: 13.12.0-rc1~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfab4d4d41a3daf6b0dc4a458dac3e814192c3ce;p=thirdparty%2Fasterisk.git

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

cfab4d4d41a3daf6b0dc4a458dac3e814192c3ce