From: Joshua Colp <jcolp@digium.com>
Date: Thu, 18 Aug 2016 16:49:04 +0000 (-0500)
Subject: Merge "sip_to_pjsip: Map (session-)timers correctly." into 13
X-Git-Tag: 13.12.0-rc1~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1ef9e697e3ef3c2ce932dd105bac7d5c2e7d420;p=thirdparty%2Fasterisk.git

Merge "sip_to_pjsip: Map (session-)timers correctly." into 13
---

e1ef9e697e3ef3c2ce932dd105bac7d5c2e7d420