]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res/res_pjsip_pubsub: Note that 'dialog' is also a valid event type for RLS...
authorMatt Jordan <mjordan@digium.com>
Fri, 22 May 2015 17:28:18 +0000 (12:28 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 22 May 2015 17:28:18 +0000 (12:28 -0500)

Trivial merge