Merge "res_pjsip: Fix deadlock on reliable transport shutdown."
authorJoshua Colp <jcolp@digium.com>
Wed, 18 Apr 2018 22:32:33 +0000 (17:32 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 18 Apr 2018 22:32:33 +0000 (17:32 -0500)
1  2 
res/res_pjsip_outbound_registration.c
res/res_pjsip_pubsub.c

Simple merge
Simple merge