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)
Change-Id: I0e89ede5ea173f2e831c42d250ddb2b21b42b89b

1  2 
src/websockets/qwebsocket_p.cpp
src/websockets/qwebsockethandshakeresponse.cpp

Simple merge