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

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

b9ae54a8ff879a94b99b619a7769b9cbb8d2bc12