Merge branch 'socket' into next
authorJean Privat <jean@pryen.org>
Thu, 16 May 2013 14:19:26 +0000 (10:19 -0400)
committerJean Privat <jean@pryen.org>
Thu, 16 May 2013 14:19:26 +0000 (10:19 -0400)
commitd3340476de53a3f92c3ef5c087db751d0a439b62
tree77a6eb954db963f8dbf2d5d9c23da45037010bec
parent84046c22d043e3cb6e184c43f805df088a07b8de
parentcc00a9d2280036e7398333ac6433b4b2749356bb
Merge branch 'socket' into next