Merge "res_pjsip WebRTC/websockets: Fix usage of WS vs WSS."
authorJoshua Colp <jcolp@digium.com>
Wed, 1 Mar 2017 23:24:43 +0000 (17:24 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 1 Mar 2017 23:24:43 +0000 (17:24 -0600)

Trivial merge