Merge "res_pjsip res_pjsip_mwi: Misc fixes and cleanups."
authorJoshua Colp <jcolp@digium.com>
Fri, 12 Aug 2016 09:46:10 +0000 (04:46 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 12 Aug 2016 09:46:10 +0000 (04:46 -0500)

Trivial merge