Merge "chan_sip.c: fix websocket_write_timeout default value"
authorMatt Jordan <mjordan@digium.com>
Mon, 28 Dec 2015 15:44:13 +0000 (09:44 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 28 Dec 2015 15:44:13 +0000 (09:44 -0600)

Trivial merge