Merge "alembic/res_pjsip: Add "webrtc" configuration option"
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Fri, 4 Aug 2017 18:11:34 +0000 (13:11 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 4 Aug 2017 18:11:34 +0000 (13:11 -0500)

Trivial merge