null
Merge branch 'master' of bitbucket.org:ant_lafarge/qtwebsocket