From: Joshua Colp <jcolp@digium.com>
Date: Thu, 6 Apr 2017 13:29:48 +0000 (-0500)
Subject: Merge "sample_config:  Add samples for pubsub to pjsip.conf.sample" into 14
X-Git-Tag: 14.5.0-rc1~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bdc535e7a65c072d3b930dcb3ad94950b5f8f51;p=thirdparty%2Fasterisk.git

Merge "sample_config:  Add samples for pubsub to pjsip.conf.sample" into 14
---

5bdc535e7a65c072d3b930dcb3ad94950b5f8f51