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

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

3a22938d1224bde9c29cc05b4fcf41c90bd9be11