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)
Pull-Request: #1418
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>
Reviewed-by: Jean Privat <jean@pryen.org>


Trivial merge