Merge branch 'xid-hash'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 11 Apr 2014 02:59:28 +0000 (19:59 -0700)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 11 Apr 2014 02:59:28 +0000 (19:59 -0700)
1  2 
lib/socket.c

diff --cc lib/socket.c
Simple merge