Merge "res_pjsip: Handle deferred SDP hold/unhold properly."
authorJoshua Colp <jcolp@digium.com>
Wed, 6 Apr 2016 12:52:56 +0000 (07:52 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 6 Apr 2016 12:52:56 +0000 (07:52 -0500)

Trivial merge