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)
commitd4088a63242acd341dc8ebbfebb0dd344c7bd293
tree02b262d058218208bcd1f4f7c0657428e060bb41
parent03616b54684a2d90ec4c485a8f4e11688a1d34b3
parent7794b312abe58e59d08e42e7e403a7473e8d7123
Merge branch 'master' of https://github.com/KurtPattyn/QWebSockets