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

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

62a59d6c2048afc30cb6ce4ab18a7a551133ef54