Merge "res_pjsip_pubsub.h: Fix doxygen association."
authorzuul <zuul@gerrit.asterisk.org>
Fri, 29 Apr 2016 03:43:29 +0000 (22:43 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 29 Apr 2016 03:43:29 +0000 (22:43 -0500)

Trivial merge