From: Joshua Colp <jcolp@digium.com>
Date: Wed, 15 Mar 2017 01:06:48 +0000 (-0500)
Subject: Merge "res_pjsip_transport_websocket: Add support for IPv6." into 14
X-Git-Tag: 14.4.0-rc1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2416cf62d5cccb18243103aec6a4308bfb120e9d;p=thirdparty%2Fasterisk.git

Merge "res_pjsip_transport_websocket: Add support for IPv6." into 14
---

2416cf62d5cccb18243103aec6a4308bfb120e9d