From: zuul <zuul@gerrit.asterisk.org>
Date: Mon, 29 Aug 2016 23:06:38 +0000 (-0500)
Subject: Merge "pjproject_bundled:  Disable srtp use by pjmedia"
X-Git-Tag: 15.0.0-beta1~685
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e91fc62f804a1f3d01d41d40fbaf96de92a7ffa1;p=thirdparty%2Fasterisk.git

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

e91fc62f804a1f3d01d41d40fbaf96de92a7ffa1