Merge commit '8ca97482b01cf1a6aa538cc5a2d1f71fb60f080c'
authorAndy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 13:42:40 +0000 (14:42 +0100)
committerAndy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 13:42:40 +0000 (14:42 +0100)
commite4eb0e39b4bbfa321fd30376ebdda32e931b60f7
treec4e20718cf0fa5f76da29f50f1297c678b3d725c
parente140d85d5346f6cc3bd8b9f3954b063e159a2708
parent8ca97482b01cf1a6aa538cc5a2d1f71fb60f080c
Merge commit '8ca97482b01cf1a6aa538cc5a2d1f71fb60f080c'

Conflicts:
libguile/r6rs-ports.c
doc/ref/api-io.texi
libguile/r6rs-ports.c
test-suite/tests/r6rs-ports.test