Merge remote-tracking branch 'origin/5.3' into 5.4
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Mon, 3 Nov 2014 12:48:18 +0000 (13:48 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>
Mon, 3 Nov 2014 12:48:23 +0000 (13:48 +0100)
commit44a071396e91de32eb3efd12a1ed230ed1632aea
treec6e514d3dd1e1503bb6df0eaa12714e97b8d625e
parent0854eda408de542047a0ef38c37953719a8f9fde
parent7aeea581882425be657123d2945c7165c7063aab
Merge remote-tracking branch 'origin/5.3' into 5.4

Change-Id: I0e89ede5ea173f2e831c42d250ddb2b21b42b89b
src/websockets/qwebsocket_p.cpp
src/websockets/qwebsockethandshakeresponse.cpp