Merge "res_pjsip/rtp: No joint capabilities between streams."
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 15 Aug 2018 14:38:12 +0000 (09:38 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 15 Aug 2018 14:38:12 +0000 (09:38 -0500)

Trivial merge