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

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

0c315e58e6658a9e4a43275f211d3de92cd650c4