Merge "res_pjsip: Add "webrtc" configuration option"
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Mon, 17 Jul 2017 20:16:30 +0000 (15:16 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 17 Jul 2017 20:16:30 +0000 (15:16 -0500)

Trivial merge