From: Joshua Colp <jcolp@digium.com>
Date: Thu, 16 Feb 2017 15:48:52 +0000 (-0600)
Subject: Merge "res_pjsip_pubsub:  Correctly implement persisted subscriptions"
X-Git-Tag: 15.0.0-beta1~353
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1edbc4c83d4472ba2e740bdf34918e60ecf9c6e;p=thirdparty%2Fasterisk.git

Merge "res_pjsip_pubsub:  Correctly implement persisted subscriptions"
---

b1edbc4c83d4472ba2e740bdf34918e60ecf9c6e