From: Joshua Colp <jcolp@digium.com>
Date: Wed, 6 Apr 2016 12:52:56 +0000 (-0500)
Subject: Merge "res_pjsip: Handle deferred SDP hold/unhold properly."
X-Git-Tag: 14.0.0-beta1~280
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97db0ca884c7fe9ba09934ffd3cbe2499c3d4ff4;p=thirdparty%2Fasterisk.git

Merge "res_pjsip: Handle deferred SDP hold/unhold properly."
---

97db0ca884c7fe9ba09934ffd3cbe2499c3d4ff4