Merge commit 'b9b88351ea2c4b43a6f90938554dc5693b17e328'
authorAndy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 13:55:16 +0000 (14:55 +0100)
committerAndy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 13:55:16 +0000 (14:55 +0100)
commitc8b7b0dad33d6221682c5f49b7635d8de7e15bab
tree59c99482d075258a6a80e63c1c8bede574c3eabb
parent12b8487d5d7272ae5bda62477df60d3e795aa645
parentb9b88351ea2c4b43a6f90938554dc5693b17e328
Merge commit 'b9b88351ea2c4b43a6f90938554dc5693b17e328'

Conflicts:
libguile/deprecated.h
test-suite/tests/00-socket.test
doc/ref/posix.texi
libguile/socket.c
test-suite/tests/00-socket.test