From: Joshua Colp <jcolp@digium.com>
Date: Thu, 18 Aug 2016 16:46:02 +0000 (-0500)
Subject: Merge "sip_to_pjsip: Write media_encryption." into 13
X-Git-Tag: 13.12.0-rc1~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02f2937f48be49e3fecb8b2e37ceaf0f9922e133;p=thirdparty%2Fasterisk.git

Merge "sip_to_pjsip: Write media_encryption." into 13
---

02f2937f48be49e3fecb8b2e37ceaf0f9922e133