From: Joshua Colp <jcolp@digium.com>
Date: Fri, 29 Apr 2016 18:33:43 +0000 (-0500)
Subject: Merge "res_pjsip_pubsub.c: Fix body generator registration race."
X-Git-Tag: 14.0.0-beta1~217
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d57847a7c792e0d12919e542076ef4818252fc39;p=thirdparty%2Fasterisk.git

Merge "res_pjsip_pubsub.c: Fix body generator registration race."
---

d57847a7c792e0d12919e542076ef4818252fc39