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

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

21d927000ec90b5f5075791e882ac8785100ba9c