From: Joshua Colp <jcolp@digium.com>
Date: Thu, 18 Aug 2016 16:45:33 +0000 (-0500)
Subject: Merge "sip_to_pjsip: Add defaultexpiry, maxexpiry, and minexpiry."
X-Git-Tag: 15.0.0-beta1~728
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b90ee04a99f83a655b304a1e057accb0e48ef449;p=thirdparty%2Fasterisk.git

Merge "sip_to_pjsip: Add defaultexpiry, maxexpiry, and minexpiry."
---

b90ee04a99f83a655b304a1e057accb0e48ef449