Merge: Fix reading from Sockets
authorJean Privat <jean@pryen.org>
Sat, 30 May 2015 00:37:42 +0000 (20:37 -0400)
committerJean Privat <jean@pryen.org>
Sat, 30 May 2015 00:37:42 +0000 (20:37 -0400)
commitdecb8c25b1da2a99ce21f5043ef1c6e14fb4b27d
tree59430e6095d553e284d8645e05eb82fbd586fcc2
parent52505890ed629b102a85b91d908d5decab9d09f7
parent2e2c160a53343e6f130c1a17bbff106fa7539a45
Merge: Fix reading from Sockets

Pull-Request: #1418
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>
Reviewed-by: Jean Privat <jean@pryen.org>