]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip: Handle deferred SDP hold/unhold properly." into certified/13.8
authorJoshua Colp <jcolp@digium.com>
Wed, 6 Apr 2016 15:10:14 +0000 (10:10 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 6 Apr 2016 15:10:14 +0000 (10:10 -0500)

Trivial merge