Merge "res_pjsip: Fix mwi_subscribe_replaces_unsolicited type mismatch"
authorGeorge Joseph <gjoseph@digium.com>
Wed, 5 Sep 2018 14:56:21 +0000 (09:56 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 5 Sep 2018 14:56:21 +0000 (09:56 -0500)

Trivial merge