From: Joshua Colp <jcolp@digium.com>
Date: Thu, 18 Aug 2016 16:45:56 +0000 (-0500)
Subject: Merge "sip_to_pjsip: Write media_encryption."
X-Git-Tag: 15.0.0-beta1~727
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91624f439c74bd6c7cb74c664484fceffeb4bb13;p=thirdparty%2Fasterisk.git

Merge "sip_to_pjsip: Write media_encryption."
---

91624f439c74bd6c7cb74c664484fceffeb4bb13