Merge "res_pjsip_pubsub: Prevent crash from AMI command on freed subscription."
authorMatt Jordan <mjordan@digium.com>
Tue, 26 Jan 2016 13:05:52 +0000 (07:05 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 26 Jan 2016 13:05:52 +0000 (07:05 -0600)

Trivial merge