Merge branch 'master' of https://github.com/KurtPattyn/QWebSockets
authorKurt Pattyn <pattyn.kurt@gmail.com>
Thu, 22 Aug 2013 18:25:26 +0000 (20:25 +0200)
committerKurt Pattyn <pattyn.kurt@gmail.com>
Thu, 22 Aug 2013 18:25:26 +0000 (20:25 +0200)

Trivial merge